From: Meador Inge <meadori@codesourcery.com>
Date: Tue, 29 May 2012 19:07:04 +0000 (+0000)
Subject: c-decl.c (c_push_function_context): Always create a new language function.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d0421638fabdc7d9b886ec43c0fceef2f8b77922;p=gcc.git

c-decl.c (c_push_function_context): Always create a new language function.

2012-05-29  Meador Inge  <meadori@codesourcery.com>

	* c-decl.c (c_push_function_context): Always create a new language
	function.
	(c_pop_function_context): Clear the language function created in
	c_push_function_context.

From-SVN: r187979
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5d87541d295..e2ebe2f54ca 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2012-05-29  Meador Inge  <meadori@codesourcery.com>
+
+	* c-decl.c (c_push_function_context): Always create a new language
+	function.
+	(c_pop_function_context): Clear the language function created in
+	c_push_function_context.
+
 2012-05-29  Matt Turner  <mattst88@gmail.com>
 
 	* config/alpha/ev6.md: (define_bypass "ev6_fmul,ev6_fadd"): New.
diff --git a/gcc/c-decl.c b/gcc/c-decl.c
index 29cd18c7dcd..0c7e80e13c5 100644
--- a/gcc/c-decl.c
+++ b/gcc/c-decl.c
@@ -8577,11 +8577,9 @@ check_for_loop_decls (location_t loc, bool turn_off_iso_c99_error)
 void
 c_push_function_context (void)
 {
-  struct language_function *p = cfun->language;
-  /* cfun->language might have been already allocated by the use of
-     -Wunused-local-typedefs.  In that case, just re-use it.  */
-  if (p == NULL)
-    cfun->language = p = ggc_alloc_cleared_language_function ();
+  struct language_function *p;
+  p = ggc_alloc_language_function ();
+  cfun->language = p;
 
   p->base.x_stmt_tree = c_stmt_tree;
   c_stmt_tree.x_cur_stmt_list
@@ -8607,11 +8605,7 @@ c_pop_function_context (void)
 
   pop_function_context ();
   p = cfun->language;
-  /* When -Wunused-local-typedefs is in effect, cfun->languages is
-     used to store data throughout the life time of the current cfun,
-     So don't deallocate it.  */
-  if (!warn_unused_local_typedefs)
-    cfun->language = NULL;
+  cfun->language = NULL;
 
   if (DECL_STRUCT_FUNCTION (current_function_decl) == 0
       && DECL_SAVED_TREE (current_function_decl) == NULL_TREE)