* tree-eh.c (optimize_double_finally): Don't assume that the

        cleanup we're duplicating is only one statement.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@129311 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 2 insertions, 8 deletions

diff --git a/gcc/tree-eh.c b/gcc/tree-eh.c
index 1924353f7b1..71d3d941b79 100644
--- a/gcc/tree-eh.c
+++ b/gcc/tree-eh.c
@@ -2157,18 +2157,12 @@ optimize_double_finally (tree one, tree two)
 
   if (same_handler_p (TREE_OPERAND (oneh, 1), TREE_OPERAND (two, 1)))
     {
-      tree twoh;
-
       tree b = TREE_OPERAND (oneh, 0);
       TREE_OPERAND (one, 1) = b;
       TREE_SET_CODE (one, TRY_CATCH_EXPR);
 
-      b = tsi_stmt (tsi_start (b));
-      twoh = TREE_OPERAND (two, 0);
-      /* same_handler_p only handles single-statement handlers,
-	 so there must only be one statement.  */
-      i = tsi_start (twoh);
-      tsi_link_before (&i, unshare_expr (b), TSI_SAME_STMT);
+      i = tsi_start (TREE_OPERAND (two, 0));
+      tsi_link_before (&i, unsave_expr_now (b), TSI_SAME_STMT);
     }
 }