From: Joseph Myers <joseph@codesourcery.com>
Date: Tue, 10 May 2011 19:12:34 +0000 (+0100)
Subject: c-decl.c (c_override_global_bindings_to_false): Remove.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=96703596c4a235c2c42f97ac354243853da80935;p=gcc.git

c-decl.c (c_override_global_bindings_to_false): Remove.

	* c-decl.c (c_override_global_bindings_to_false): Remove.
	(global_bindings_p): Don't check
	c_override_global_bindings_to_false.
	* c-tree.h (c_override_global_bindings_to_false): Remove.
	* c-typeck.c (composite_type): Don't set
	c_override_global_bindings_to_false.

From-SVN: r173632
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fb479a43e0f..410bc2641e0 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2011-05-10  Joseph Myers  <joseph@codesourcery.com>
+
+	* c-decl.c (c_override_global_bindings_to_false): Remove.
+	(global_bindings_p): Don't check
+	c_override_global_bindings_to_false.
+	* c-tree.h (c_override_global_bindings_to_false): Remove.
+	* c-typeck.c (composite_type): Don't set
+	c_override_global_bindings_to_false.
+
 2011-05-10  Michael Meissner  <meissner@linux.vnet.ibm.com>
 
 	PR target/48857, 48495
diff --git a/gcc/c-decl.c b/gcc/c-decl.c
index 6e359a9f41e..3843f7710f8 100644
--- a/gcc/c-decl.c
+++ b/gcc/c-decl.c
@@ -147,10 +147,6 @@ static int warn_about_return_type;
 
 static bool undef_nested_function;
 
-/* True means global_bindings_p should return false even if the scope stack
-   says we are in file scope.  */
-bool c_override_global_bindings_to_false;
-
 
 /* Each c_binding structure describes one binding of an identifier to
    a decl.  All the decls in a scope - irrespective of namespace - are
@@ -850,7 +846,7 @@ objc_mark_locals_volatile (void *enclosing_blk)
 bool
 global_bindings_p (void)
 {
-  return current_scope == file_scope && !c_override_global_bindings_to_false;
+  return current_scope == file_scope;
 }
 
 void
diff --git a/gcc/c-tree.h b/gcc/c-tree.h
index e2b42bf8317..95a0ba2e1f4 100644
--- a/gcc/c-tree.h
+++ b/gcc/c-tree.h
@@ -597,11 +597,6 @@ extern int current_function_returns_abnormally;
 
 extern int system_header_p;
 
-/* True means global_bindings_p should return false even if the scope stack
-   says we are in file scope.  */
-
-extern bool c_override_global_bindings_to_false;
-
 /* In c-decl.c */
 extern void c_finish_incomplete_decl (tree);
 extern void c_write_global_declarations (void);
diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c
index 545cd01ec16..6016db2783f 100644
--- a/gcc/c-typeck.c
+++ b/gcc/c-typeck.c
@@ -507,9 +507,6 @@ composite_type (tree t1, tree t2)
 
 	/* If both args specify argument types, we must merge the two
 	   lists, argument by argument.  */
-	/* Tell global_bindings_p to return false so that variable_size
-	   doesn't die on VLAs in parameter types.  */
-	c_override_global_bindings_to_false = true;
 
 	len = list_length (p1);
 	newargs = 0;
@@ -592,7 +589,6 @@ composite_type (tree t1, tree t2)
 	  parm_done: ;
 	  }
 
-	c_override_global_bindings_to_false = false;
 	t1 = build_function_type (valtype, newargs);
 	t1 = qualify_type (t1, t2);
 	/* ... falls through ...  */