From 0a3d52ddee038a5b11eda5697f12d28019d83041 Mon Sep 17 00:00:00 2001 From: Aaron Sawdey Date: Fri, 15 Feb 2019 15:41:25 +0000 Subject: [PATCH] re PR rtl-optimization/88308 (ICE in maybe_record_trace_start, at dwarf2cfi.c:2309) 2019-02-15 Aaron Sawdey PR rtl-optimization/88308 * shrink-wrap.c (move_insn_for_shrink_wrap): Fix LABEL_NUSES counts on copied instruction. From-SVN: r268942 --- gcc/ChangeLog | 6 ++++++ gcc/shrink-wrap.c | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9d130110cab..7d728c0afbc 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2019-02-15 Aaron Sawdey + + PR rtl-optimization/88308 + * shrink-wrap.c (move_insn_for_shrink_wrap): Fix LABEL_NUSES counts + on copied instruction. + 2019-02-15 Eric Botcazou * final.c (insn_current_reference_address): Replace test on JUMP_P diff --git a/gcc/shrink-wrap.c b/gcc/shrink-wrap.c index e0f55ee5e2e..57124db92c6 100644 --- a/gcc/shrink-wrap.c +++ b/gcc/shrink-wrap.c @@ -414,7 +414,12 @@ move_insn_for_shrink_wrap (basic_block bb, rtx_insn *insn, dead_debug_insert_temp (debug, DF_REF_REGNO (def), insn, DEBUG_TEMP_BEFORE_WITH_VALUE); - emit_insn_after (PATTERN (insn), bb_note (bb)); + rtx_insn *insn_copy = emit_insn_after (PATTERN (insn), bb_note (bb)); + /* Update the LABEL_NUSES count on any referenced labels. The ideal + solution here would be to actually move the instruction instead + of copying/deleting it as this loses some notations on the + insn. */ + mark_jump_label (PATTERN (insn), insn_copy, 0); delete_insn (insn); return true; } -- 2.30.2