+2000-05-24 Jason Merrill <jason@casey.soma.redhat.com>
+
+ * stmt.c (expand_end_bindings): Look through NOTEs to find a
+ BARRIER.
+
2000-05-24 Mark Mitchell <mark@codesourcery.com>
* calls.c (expand_call): Handle cleanups in tail-recursion
if (thisblock->data.block.stack_level != 0
|| thisblock->data.block.cleanups != 0)
{
- /* Only clean up here if this point can actually be reached. */
- int reachable = GET_CODE (get_last_insn ()) != BARRIER;
+ int reachable;
+ rtx insn;
/* Don't let cleanups affect ({...}) constructs. */
int old_expr_stmts_for_value = expr_stmts_for_value;
tree old_last_expr_type = last_expr_type;
expr_stmts_for_value = 0;
+ /* Only clean up here if this point can actually be reached. */
+ insn = get_last_insn ();
+ if (GET_CODE (insn) == NOTE)
+ insn = prev_nonnote_insn (insn);
+ reachable = GET_CODE (insn) != BARRIER;
+
/* Do the cleanups. */
expand_cleanups (thisblock->data.block.cleanups, NULL_TREE, 0, reachable);
if (reachable)