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

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
3fd0303a · Richard Biener · Richard Biener · 22fc7d3d · 3fd0303a · 3fd0303a
Commit 3fd0303a authored Jun 19, 2013 by Richard Biener Committed by Richard Biener Jun 19, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletions

gcc/ChangeLog
+5 -0

gcc/expr.c
+1 -1

No files found.
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
+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:

--- 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)