diff options
Diffstat (limited to 'gcc/reload1.c')
| -rw-r--r-- | gcc/reload1.c | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/gcc/reload1.c b/gcc/reload1.c index 499412c0ba4..ba6ce37da9d 100644 --- a/gcc/reload1.c +++ b/gcc/reload1.c @@ -4548,7 +4548,7 @@ reload_as_needed (int live_known) #if defined (AUTO_INC_DEC) int i; #endif - rtx x; + rtx x, marker; memset (spill_reg_rtx, 0, sizeof spill_reg_rtx); memset (spill_reg_store, 0, sizeof spill_reg_store); @@ -4559,6 +4559,10 @@ reload_as_needed (int live_known) set_initial_elim_offsets (); + /* Generate a marker insn that we will move around. */ + marker = emit_note (NOTE_INSN_DELETED); + unlink_insn_chain (marker, marker); + for (chain = reload_insn_chain; chain; chain = chain->next) { rtx prev = 0; @@ -4631,7 +4635,10 @@ reload_as_needed (int live_known) rtx next = NEXT_INSN (insn); rtx p; + /* ??? PREV can get deleted by reload inheritance. + Work around this by emitting a marker note. */ prev = PREV_INSN (insn); + reorder_insns_nobb (marker, marker, prev); /* Now compute which reload regs to reload them into. Perhaps reusing reload regs from previous insns, or else output @@ -4649,10 +4656,22 @@ reload_as_needed (int live_known) and that we moved the structure into). */ subst_reloads (insn); + prev = PREV_INSN (marker); + unlink_insn_chain (marker, marker); + /* Adjust the exception region notes for loads and stores. */ if (cfun->can_throw_non_call_exceptions && !CALL_P (insn)) fixup_eh_region_note (insn, prev, next); + /* Adjust the location of REG_ARGS_SIZE. */ + p = find_reg_note (insn, REG_ARGS_SIZE, NULL_RTX); + if (p) + { + remove_note (insn, p); + fixup_args_size_notes (prev, PREV_INSN (next), + INTVAL (XEXP (p, 0))); + } + /* If this was an ASM, make sure that all the reload insns we have generated are valid. If not, give an error and delete them. */ |