Subzero: Fixed deadlock with _start but no globals

src/IceInstrumentation.cpp

 //===- subzero/src/IceInstrumentation.cpp - ICE instrumentation framework -===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
@@ skipping 100 matching lines @@
   case Inst::Unreachable:
     instrumentUnreachable(Context, llvm::cast<InstUnreachable>(Instr));
     break;
   default:
     // Only instrument high-level ICE instructions
     assert(false && "Instrumentation encountered an unexpected instruction");
     break;
   }
 }
 
+void Instrumentation::setHasSeenGlobals() {
+  std::unique_lock<std::mutex> GlobalsLock(GlobalsSeenMutex);

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

I think this could be simpler:

void Instrumentation::setHasSeenGlobals() {
  {
    std::unique_lock<std::mutex> _(GlobalsSeenMutex);
    HasSeenGlobals = true;
  }
  GlobalsSeenCV.notify_all();
}

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

Done.

+  HasSeenGlobals = true;
+  GlobalsLock.unlock();
+  GlobalsSeenCV.notify_all();
+}
+
+LockedPtr<VariableDeclarationList> Instrumentation::getGlobals() {
+  std::unique_lock<std::mutex> GlobalsLock(GlobalsSeenMutex);
+  GlobalsSeenCV.wait(GlobalsLock, [&] { return HasSeenGlobals; });

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

Instead of default capture, can you capture "this"?

  GlobalsSeenCV.wait(GlobalsLock, [this] { return HasSeenGlobals; });

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

Done.

+  return Ctx->getGlobals();
+}
+
 } // end of namespace Ice