IA-64 ABI Exception Handling.

[thirdparty/gcc.git] / gcc / stmt.c

diff --git a/gcc/stmt.c b/gcc/stmt.c
index 743f81734290ba8ea037666e9aa08444c34734df..12f1562cbf6b85e4df51b12daf983b8d7a0b4169 100644 (file)
--- a/gcc/stmt.c
+++ b/gcc/stmt.c
@@ -4072,12 +4072,11 @@ expand_decl_cleanup (decl, cleanup)
          start_sequence ();
        }
 
-      /* If this was optimized so that there is no exception region for the
-        cleanup, then mark the TREE_LIST node, so that we can later tell
-        if we need to call expand_eh_region_end.  */
-      if (! using_eh_for_cleanups_p
-         || expand_eh_region_start_tree (decl, cleanup))
+      if (! using_eh_for_cleanups_p)
        TREE_ADDRESSABLE (t) = 1;
+      else
+       expand_eh_region_start ();
+
       /* If that started a new EH region, we're in a new block.  */
       thisblock = block_stack;
 
@@ -4106,82 +4105,6 @@ expand_decl_cleanup (decl, cleanup)
     }
   return 1;
 }
-
-/* Arrange for the top element of the dynamic cleanup chain to be
-   popped if we exit the current binding contour.  DECL is the
-   associated declaration, if any, otherwise NULL_TREE.  If the
-   current contour is left via an exception, then __sjthrow will pop
-   the top element off the dynamic cleanup chain.  The code that
-   avoids doing the action we push into the cleanup chain in the
-   exceptional case is contained in expand_cleanups.
-
-   This routine is only used by expand_eh_region_start, and that is
-   the only way in which an exception region should be started.  This
-   routine is only used when using the setjmp/longjmp codegen method
-   for exception handling.  */
-
-int
-expand_dcc_cleanup (decl)
-     tree decl;
-{
-  struct nesting *thisblock;
-  tree cleanup;
-
-  /* Error if we are not in any block.  */
-  if (cfun == 0 || block_stack == 0)
-    return 0;
-  thisblock = block_stack;
-
-  /* Record the cleanup for the dynamic handler chain.  */
-
-  cleanup = make_node (POPDCC_EXPR);
-
-  /* Add the cleanup in a manner similar to expand_decl_cleanup.  */
-  thisblock->data.block.cleanups
-    = tree_cons (decl, cleanup, thisblock->data.block.cleanups);
-
-  /* If this block has a cleanup, it belongs in stack_block_stack.  */
-  stack_block_stack = thisblock;
-  return 1;
-}
-
-/* Arrange for the top element of the dynamic handler chain to be
-   popped if we exit the current binding contour.  DECL is the
-   associated declaration, if any, otherwise NULL_TREE.  If the current
-   contour is left via an exception, then __sjthrow will pop the top
-   element off the dynamic handler chain.  The code that avoids doing
-   the action we push into the handler chain in the exceptional case
-   is contained in expand_cleanups.
-
-   This routine is only used by expand_eh_region_start, and that is
-   the only way in which an exception region should be started.  This
-   routine is only used when using the setjmp/longjmp codegen method
-   for exception handling.  */
-
-int
-expand_dhc_cleanup (decl)
-     tree decl;
-{
-  struct nesting *thisblock;
-  tree cleanup;
-
-  /* Error if we are not in any block.  */
-  if (cfun == 0 || block_stack == 0)
-    return 0;
-  thisblock = block_stack;
-
-  /* Record the cleanup for the dynamic handler chain.  */
-
-  cleanup = make_node (POPDHC_EXPR);
-
-  /* Add the cleanup in a manner similar to expand_decl_cleanup.  */
-  thisblock->data.block.cleanups
-    = tree_cons (decl, cleanup, thisblock->data.block.cleanups);
-
-  /* If this block has a cleanup, it belongs in stack_block_stack.  */
-  stack_block_stack = thisblock;
-  return 1;
-}
 \f
 /* DECL is an anonymous union.  CLEANUP is a cleanup for DECL.
    DECL_ELTS is the list of elements that belong to DECL's type.
@@ -4286,20 +4209,8 @@ expand_cleanups (list, dont_do, in_fixup, reachable)
          expand_cleanups (TREE_VALUE (tail), dont_do, in_fixup, reachable);
        else
          {
-           if (! in_fixup)
-             {
-               tree cleanup = TREE_VALUE (tail);
-
-               /* See expand_d{h,c}c_cleanup for why we avoid this.  */
-               if (TREE_CODE (cleanup) != POPDHC_EXPR
-                   && TREE_CODE (cleanup) != POPDCC_EXPR
-                   /* See expand_eh_region_start_tree for this case.  */
-                   && ! TREE_ADDRESSABLE (tail))
-                 {
-                   cleanup = protect_with_terminate (cleanup);
-                   expand_eh_region_end (cleanup);
-                 }
-             }
+           if (! in_fixup && using_eh_for_cleanups_p)
+             expand_eh_region_end_cleanup (TREE_VALUE (tail));
 
            if (reachable)
              {
@@ -4312,19 +4223,18 @@ expand_cleanups (list, dont_do, in_fixup, reachable)
                   times, the control paths are non-overlapping so the
                   cleanups will not be executed twice.  */
 
-               /* We may need to protect fixups with rethrow regions.  */
-               int protect = (in_fixup && ! TREE_ADDRESSABLE (tail));
+               /* We may need to protect from outer cleanups.  */
+               if (in_fixup && using_eh_for_cleanups_p)
+                 {
+                   expand_eh_region_start ();
+
+                   expand_expr (TREE_VALUE (tail), const0_rtx, VOIDmode, 0);
 
-               if (protect)
-                 expand_fixup_region_start ();
+                   expand_eh_region_end_fixup (TREE_VALUE (tail));
+                 }
+               else
+                 expand_expr (TREE_VALUE (tail), const0_rtx, VOIDmode, 0);
 
-               /* The cleanup might contain try-blocks, so we have to
-                  preserve our current queue.  */
-               push_ehqueue ();
-               expand_expr (TREE_VALUE (tail), const0_rtx, VOIDmode, 0);
-               pop_ehqueue ();
-               if (protect)
-                 expand_fixup_region_end (TREE_VALUE (tail));
                free_temp_slots ();
              }
          }