From: Jason Merrill <jason@yorick.cygnus.com>
Date: Mon, 1 Dec 1997 02:56:55 +0000 (+0000)
Subject: * stmt.c (expand_decl_cleanup): Update thisblock after eh_region_start.
X-Git-Tag: releases/egcs-1.0.0~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0c183e43537a0067bf62414c8e2031bf25e252f;p=thirdparty%2Fgcc.git

* stmt.c (expand_decl_cleanup): Update thisblock after eh_region_start.

From-SVN: r16863
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 789ece6738b5..f43343cd1492 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+Sun Nov 30 19:59:20 1997  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* stmt.c (expand_decl_cleanup): Update thisblock after eh_region_start.
+
 Sat Nov 29 12:44:57 1997  David Edelsohn  <edelsohn@mhpcc.edu>
 
 	* rs6000.c (function_arg_partial_nregs): Undo Nov. 26 patch.
diff --git a/gcc/stmt.c b/gcc/stmt.c
index 4cae1ce3bf3e..2fb2d313d826 100644
--- a/gcc/stmt.c
+++ b/gcc/stmt.c
@@ -3987,6 +3987,8 @@ expand_decl_cleanup (decl, cleanup)
       if (! using_eh_for_cleanups_p
 	  || expand_eh_region_start_tree (decl, cleanup))
 	TREE_ADDRESSABLE (t) = 1;
+      /* If that started a new EH region, we're in a new block.  */
+      thisblock = block_stack;
 
       if (cond_context)
 	{