From: Richard Biener <rguenther@suse.de>
Date: Wed, 19 Jun 2013 08:15:31 +0000 (+0000)
Subject: expr.c (expand_expr_real_1): Use SCOPE_FILE_SCOPE_P to check for global context.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3fd0303a574dc611fc411137b59adf683ea2d236;p=gcc.git

expr.c (expand_expr_real_1): Use SCOPE_FILE_SCOPE_P to check for global context.

2013-06-19  Richard Biener  <rguenther@suse.de>

	* expr.c (expand_expr_real_1): Use SCOPE_FILE_SCOPE_P to check
	for global context.

From-SVN: r200190
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9fc3562576c..c12d8428d90 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-19  Richard Biener  <rguenther@suse.de>
+
+	* expr.c (expand_expr_real_1): Use SCOPE_FILE_SCOPE_P to check
+	for global context.
+
 2013-06-19  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
 
 	Revert:
diff --git a/gcc/expr.c b/gcc/expr.c
index c68f489e8de..2a7824b62a2 100644
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -9353,7 +9353,7 @@ expand_expr_real_1 (tree exp, rtx target, enum machine_mode tmode,
       /* Variables inherited from containing functions should have
 	 been lowered by this point.  */
       context = decl_function_context (exp);
-      gcc_assert (!context
+      gcc_assert (SCOPE_FILE_SCOPE_P (context)
 		  || context == current_function_decl
 		  || TREE_STATIC (exp)
 		  || DECL_EXTERNAL (exp)