aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/cgraphunit.c2
2 files changed, 7 insertions, 0 deletions
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