From patchwork Thu Jul 15 16:39:35 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: Finish cleanup after creating cdtor
Date: Thu, 15 Jul 2010 06:39:35 -0000
From: Richard Henderson <rth@redhat.com>
X-Patchwork-Id: 58993
Message-Id: <4C3F39C7.2070205@redhat.com>
To: GCC Patches <gcc-patches@gcc.gnu.org>

A patchlet from the emutls rewrite.  Committed.


r~
commit 3bf3b560957127a32fe843e8cbbede61c9565afe
Author: Richard Henderson <rth@twiddle.net>
Date:   Tue Jul 13 10:57:09 2010 -0700

    Finish zeroing out the current function status after building cdtor.


diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2e80e69..087e751 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-15  Richard Henderson  <rth@redhat.com>
+
+	* cgraphunit.c (cgraph_build_static_cdtor): Clear current_function_decl
+	when done.
+
 2010-07-15  Jan Hubicka  <jh@suse.cz>
 
 	* lto-symtab.c (lto_symtab_resolve_symbols): Remove hack handling comdats
diff --git a/gcc/cgraphunit.c b/gcc/cgraphunit.c
index 2367067..47f8f76 100644
--- a/gcc/cgraphunit.c
+++ b/gcc/cgraphunit.c
@@ -2064,7 +2064,9 @@ cgraph_build_static_cdtor (char which, tree body, int priority)
 
   cgraph_add_new_function (decl, false);
   cgraph_mark_needed_node (cgraph_node (decl));
+
   set_cfun (NULL);
+  current_function_decl = NULL;
 }
 
 void