diff options
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/reorg.c | 21 |
2 files changed, 27 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5850d78..693d062 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2001-07-19 Mark Mitchell <mark@codesourcery.com> + + * reorg.c (fill_simple_delay_slots): If an instruction might throw + an exception that will be caught within this function, do not fill + its delay slot with any subsequent instruction. + 2001-07-19 Steve Ellcey <sje@cup.hp.com> * tm.texi (POINTERS_EXTEND_UNSIGNED) Modify definition. diff --git a/gcc/reorg.c b/gcc/reorg.c index b521645..1f26e7e 100644 --- a/gcc/reorg.c +++ b/gcc/reorg.c @@ -2223,6 +2223,27 @@ fill_simple_delay_slots (non_jumps_p) fill_eager_delay_slots anyways, it was just deleted. */ if (slots_filled != slots_to_fill + /* If this instruction could throw an exception which is + caught in the same function, then it's not safe to fill + the delay slot with an instruction from beyond this + point. For example, consider: + + int i = 2; + + try { + f(); + i = 3; + } catch (...) {} + + return i; + + Even though `i' is a local variable, we must be sure not + to put `i = 3' in the delay slot if `f' might throw an + exception. + + Presumably, we should also check to see if we could get + back to this function via `setjmp'. */ + && !can_throw_internal (insn) && (GET_CODE (insn) != JUMP_INSN || ((condjump_p (insn) || condjump_in_parallel_p (insn)) && ! simplejump_p (insn) |