[Bug debug/59575] [4.9 regression] ICE in maybe_record_trace_start, at dwarf2cfi.c:2239

[hubicka at gcc dot gnu.org]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59575

--- Comment #5 from Jan Hubicka <hubicka at gcc dot gnu.org> ---
I am testing:
Index: combine-stack-adj.c
===================================================================
--- combine-stack-adj.c (revision 206233)
+++ combine-stack-adj.c (working copy)
@@ -567,6 +568,7 @@ combine_stack_adjustments_for_block (bas
              && try_apply_stack_adjustment (insn, reflist, 0,
                                             -last_sp_adjust))
            {
+             rtx note;
              if (last2_sp_set)
                maybe_move_args_size_note (last2_sp_set, last_sp_set, false);
              else
@@ -576,6 +578,11 @@ combine_stack_adjustments_for_block (bas
              reflist = NULL;
              last_sp_set = NULL_RTX;
              last_sp_adjust = 0;
+             /* We no longer adjust stack size.  Whoever adjusted it earlier
+                hopefully got the note right.  */
+             note = find_reg_note (insn, REG_ARGS_SIZE, NULL_RTX);
+             if (note)
+               remove_note (insn, note);
              continue;
            }
        }