@@ -1179,7 +1179,7 @@ combine_instructions (rtx f, unsigned in
FOR_EACH_BB (this_basic_block)
{
- rtx last_combined_insn = NULL_RTX;
+ rtx last_combined_insn = pc_rtx;
optimize_this_for_speed_p = optimize_bb_for_speed_p (this_basic_block);
last_call_luid = 0;
mem_last_set = -1;
@@ -1198,9 +1198,26 @@ combine_instructions (rtx f, unsigned in
next = 0;
if (NONDEBUG_INSN_P (insn))
{
- if (last_combined_insn == NULL_RTX
- || DF_INSN_LUID (last_combined_insn) < DF_INSN_LUID (insn))
+ if (last_combined_insn == pc_rtx)
last_combined_insn = insn;
+ else if (last_combined_insn)
+ {
+ if (INSN_DELETED_P (last_combined_insn))
+ {
+ while (last_combined_insn
+ != NEXT_INSN (BB_END (this_basic_block))
+ && (!NONDEBUG_INSN_P (last_combined_insn)
+ || INSN_DELETED_P (last_combined_insn)))
+ last_combined_insn = NEXT_INSN (last_combined_insn);
+ if (last_combined_insn
+ == NEXT_INSN (BB_END (this_basic_block)))
+ last_combined_insn = NULL_RTX;
+ }
+ if (last_combined_insn
+ && DF_INSN_LUID (last_combined_insn)
+ <= DF_INSN_LUID (insn))
+ last_combined_insn = insn;
+ }
/* See if we know about function return values before this
insn based upon SUBREG flags. */
@@ -2451,14 +2468,14 @@ propagate_for_debug_subst (rtx from, con
static void
propagate_for_debug (rtx insn, rtx last, rtx dest, rtx src)
{
- rtx next, loc;
+ rtx next, loc, end = NEXT_INSN (BB_END (this_basic_block));
struct rtx_subst_pair p;
p.to = src;
p.adjusted = false;
next = NEXT_INSN (insn);
- while (next != last)
+ while (next != last && next != end)
{
insn = next;
next = NEXT_INSN (insn);
@@ -3904,8 +3921,9 @@ try_combine (rtx i3, rtx i2, rtx i1, rtx
first = i3;
last = undobuf.other_insn;
gcc_assert (last);
- if (DF_INSN_LUID (last)
- < DF_INSN_LUID (last_combined_insn))
+ if (last_combined_insn == NULL_RTX
+ || (DF_INSN_LUID (last)
+ < DF_INSN_LUID (last_combined_insn)))
last = last_combined_insn;
}
@@ -0,0 +1,63 @@
+// PR rtl-optimization/48549
+// { dg-do compile }
+// { dg-options "-fcompare-debug -O2" }
+
+void
+foo (void *from, void *to)
+{
+ long offset = reinterpret_cast <long>(to) - reinterpret_cast <long>(from);
+ if (offset != static_cast <int>(offset))
+ *(int *) 0xC0DE = 0;
+ reinterpret_cast <int *>(from)[1] = offset;
+}
+struct A
+{
+ A () : a () {}
+ A (void *x) : a (x) {}
+ void *bar () { return a; }
+ void *a;
+};
+struct C;
+struct D;
+struct E : public A
+{
+ C m1 (int);
+ D m2 ();
+ E () {}
+ E (A x) : A (x) {}
+};
+struct C : public E
+{
+ C () {}
+ C (void *x) : E (x) {}
+};
+struct D : public E
+{
+ D (void *x) : E (x) {}
+};
+C
+E::m1 (int x)
+{
+ return (reinterpret_cast <char *>(bar ()) + x);
+}
+D
+E::m2 ()
+{
+ return reinterpret_cast <char *>(bar ());
+}
+struct B
+{
+ E a;
+ unsigned b : 16;
+ unsigned c : 1;
+};
+void
+baz (B *x)
+{
+ for (unsigned i = 0; i < 64; i++)
+ {
+ D d = x[i].a.m2 ();
+ C c = x[i].a.m1 (x[i].c);
+ foo (d.bar (), c.bar ());
+ }
+}