From 2d6568bdcb4d922bdd60267b359ee419c8823b32 Mon Sep 17 00:00:00 2001 From: Jim Wilson Date: Sat, 18 Mar 2017 05:37:52 +0000 Subject: [PATCH] Fix aarch64 bootstrap compare failure. gcc/ * combine.c (try_combine): Delete redundant i1 test. Call prev_nonnote_nondebug_insn instead of prev_nonnote_insn. From-SVN: r246253 --- gcc/ChangeLog | 5 +++++ gcc/combine.c | 7 +++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 3e108dda311..8b4aa584c3d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2017-03-17 Jim Wilson + + * combine.c (try_combine): Delete redundant i1 test. Call + prev_nonnote_nondebug_insn instead of prev_nonnote_insn. + 2017-03-17 Palmer Dabbelt : Add riscv32-*-elf, diff --git a/gcc/combine.c b/gcc/combine.c index ff0df80a801..463737f9773 100644 --- a/gcc/combine.c +++ b/gcc/combine.c @@ -2806,9 +2806,8 @@ try_combine (rtx_insn *i3, rtx_insn *i2, rtx_insn *i1, rtx_insn *i0, bitmap_set_bit (links_regset, ll->regno); FOR_EACH_LOG_LINK (ll, i2) bitmap_set_bit (links_regset, ll->regno); - if (i1) - FOR_EACH_LOG_LINK (ll, i1) - bitmap_set_bit (links_regset, ll->regno); + FOR_EACH_LOG_LINK (ll, i1) + bitmap_set_bit (links_regset, ll->regno); if (i0) FOR_EACH_LOG_LINK (ll, i0) bitmap_set_bit (links_regset, ll->regno); @@ -4142,7 +4141,7 @@ try_combine (rtx_insn *i3, rtx_insn *i2, rtx_insn *i1, rtx_insn *i0, multi-word registers. Later, when fixing up LOG_LINKS, we deal with the case where a pseudo use moved. */ if (!bitmap_empty_p (new_regs_in_i2) - && prev_nonnote_insn (i3) != i2 + && prev_nonnote_nondebug_insn (i3) != i2 && bitmap_first_set_bit (new_regs_in_i2) < FIRST_PSEUDO_REGISTER) { undo_all (); -- 2.30.2