From 2c647865dc4480a8b278ff7811dcd64bbaefdd84 Mon Sep 17 00:00:00 2001 From: nathan Date: Thu, 12 Jan 2017 13:54:43 +0000 Subject: [PATCH] * combine.c (try_combine): Don't ignore result of overlap checking loop. Combine overlap & asm check into single loop. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@244361 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 6 ++++++ gcc/combine.c | 28 +++++++++++++++------------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 012c095c78f..da9d21313b6 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2017-01-12 Nathan Sidwell + Nicolai Stange + + * combine.c (try_combine): Don't ignore result of overlap checking + loop. Combine overlap & asm check into single loop. + 2017-01-12 Richard Biener * tree-pretty-print.c (dump_generic_node): Provide -gimple diff --git a/gcc/combine.c b/gcc/combine.c index 3043f2a7adb..3598045afdb 100644 --- a/gcc/combine.c +++ b/gcc/combine.c @@ -2785,22 +2785,24 @@ try_combine (rtx_insn *i3, rtx_insn *i2, rtx_insn *i1, rtx_insn *i0, (Besides, reload can't handle output reloads for this.) The problem can also happen if the dest of I3 is a memory ref, - if another dest in I2 is an indirect memory ref. */ - for (i = 0; i < XVECLEN (p2, 0); i++) - if ((GET_CODE (XVECEXP (p2, 0, i)) == SET - || GET_CODE (XVECEXP (p2, 0, i)) == CLOBBER) - && reg_overlap_mentioned_p (SET_DEST (PATTERN (i3)), - SET_DEST (XVECEXP (p2, 0, i)))) - break; + if another dest in I2 is an indirect memory ref. - /* Make sure this PARALLEL is not an asm. We do not allow combining + Neither can this PARALLEL be an asm. We do not allow combining that usually (see can_combine_p), so do not here either. */ - for (i = 0; i < XVECLEN (p2, 0); i++) - if (GET_CODE (XVECEXP (p2, 0, i)) == SET - && GET_CODE (SET_SRC (XVECEXP (p2, 0, i))) == ASM_OPERANDS) - break; + bool ok = true; + for (i = 0; ok && i < XVECLEN (p2, 0); i++) + { + if ((GET_CODE (XVECEXP (p2, 0, i)) == SET + || GET_CODE (XVECEXP (p2, 0, i)) == CLOBBER) + && reg_overlap_mentioned_p (SET_DEST (PATTERN (i3)), + SET_DEST (XVECEXP (p2, 0, i)))) + ok = false; + else if (GET_CODE (XVECEXP (p2, 0, i)) == SET + && GET_CODE (SET_SRC (XVECEXP (p2, 0, i))) == ASM_OPERANDS) + ok = false; + } - if (i == XVECLEN (p2, 0)) + if (ok) for (i = 0; i < XVECLEN (p2, 0); i++) if (GET_CODE (XVECEXP (p2, 0, i)) == SET && SET_DEST (XVECEXP (p2, 0, i)) == SET_SRC (PATTERN (i3))) -- 2.11.4.GIT