Merge pull request #58 from rust-lang/fix/remove-global

Fix for global variable removal

Author: antoyo

gcc/jit/jit-playback.cc

@@ -789,9 +789,6 @@ global_new_decl (location *loc,
 			   type_tree);
 
   TREE_PUBLIC (inner) = (kind != GCC_JIT_GLOBAL_INTERNAL);
-  if (removed)
-    TREE_ASM_WRITTEN (inner) = 1;
-
 
   int will_be_init = flags & (GLOBAL_VAR_FLAGS_WILL_BE_RVAL_INIT |
 			      GLOBAL_VAR_FLAGS_WILL_BE_BLOB_INIT);
@@ -854,9 +851,10 @@ set_variable_string_attribute (
 
 playback::lvalue *
 playback::context::
-global_finalize_lvalue (tree inner)
+global_finalize_lvalue (tree inner, bool removed)
 {
-  m_globals.safe_push (inner);
+  if (!removed)
+    m_globals.safe_push (inner);
 
   return new lvalue (this, inner);
 }
@@ -878,7 +876,7 @@ new_global (location *loc,
   tree inner =
     global_new_decl (loc, kind, type, name, flags, attributes, readonly, removed);
 
-  return global_finalize_lvalue (inner);
+  return global_finalize_lvalue (inner, removed);
 }
 
 void
@@ -1061,7 +1059,7 @@ new_global_initialized (location *loc,
   /* Compare with 'store_init_value' c-typeck.cc:7555.  */
   DECL_INITIAL (inner) = ctor;
 
-  return global_finalize_lvalue (inner);
+  return global_finalize_lvalue (inner, removed);
 }
 
 /* Implementation of the various

gcc/jit/jit-playback.h

@@ -367,7 +367,7 @@ class context : public log_user
 		   bool readonly,
                    bool removed);
   lvalue *
-  global_finalize_lvalue (tree inner);
+  global_finalize_lvalue (tree inner, bool removed);
 
 private: