Subzero: Fixed deadlock with _start but no globals

src/IceGlobalContext.h

Index: src/IceGlobalContext.h
diff --git a/src/IceGlobalContext.h b/src/IceGlobalContext.h
index 2d60f4845466f879ebc50a407ca021edab29a01f..9f3e95ee3ee1a93c79690398edb32a65ba05d73c 100644
--- a/src/IceGlobalContext.h
+++ b/src/IceGlobalContext.h
@@ -482,6 +482,10 @@ public:
     return LockedPtr<StringPool>(Strings.get(), &StringsLock);
   }
 
+  LockedPtr<VariableDeclarationList> getGlobals() {
+    return LockedPtr<VariableDeclarationList>(&Globals, &InitAllocLock);
+  }
+
   /// Number of function blocks that can be queued before waiting for
   /// translation
   /// threads to consume.
@@ -612,6 +616,8 @@ private:
     LockedPtr<VariableDeclarationList> _(&Globals, &InitAllocLock);
     if (Globls != nullptr) {
       Globals.merge(Globls.get());
+      if (!BuildDefs::minimal() && Instrumentor != NULL)

[Jim Stichnoth, 2016/07/19 22:39:00]

nullptr

[tlively, 2016/07/19 23:20:14]

Done.

+        Instrumentor->setHasSeenGlobals();
     }
   }