Subzero: Make -translate-only work with nonzero -threads=<N>.

When we skip translating an item due to the -translate-only option, we still need to add a dummy item to the work queue with the proper sequence number, otherwise the emitter thread waits endlessly for the next sequence number and never emits the rest of the items. BUG= none R=jpp@chromium.org Review URL: https://codereview.chromium.org/2099293002 .

Subzero: Make -translate-only work with nonzero -threads=<N>.
5f55d405 · Jim Stichnoth · 00b9edba · 5f55d405
Commit 5f55d405 authored Jun 27, 2016 by Jim Stichnoth
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

IceGlobalContext.cpp src/IceGlobalContext.cpp +5 -1

No files found.
--- a/src/IceGlobalContext.cpp
+++ b/src/IceGlobalContext.cpp
@@ -362,6 +362,7 @@ GlobalContext::GlobalContext(Ostream *OsDump, Ostream *OsEmit, Ostream *OsError,
 void GlobalContext::translateFunctions() {
  TimerMarker Timer(TimerStack::TT_translateFunctions, this);
  while (std::unique_ptr<OptWorkItem> OptItem = optQueueBlockingPop()) {
+    std::unique_ptr<EmitterWorkItem> Item;
    auto Func = OptItem->getParsedCfg();
    // Install Func in TLS for Cfg-specific container allocators.
    CfgLocalAllocatorScope _(Func.get());
@@ -379,11 +380,14 @@ void GlobalContext::translateFunctions() {
        !getFlags().matchTranslateOnly(Func->getFunctionName(),
                                       Func->getSequenceNumber())) {
      Func->dump();
+      // Add a dummy work item as a placeholder.  This maintains sequence
+      // numbers so that the emitter thread will emit subsequent functions.
+      Item = makeUnique<EmitterWorkItem>(Func->getSequenceNumber());
+      emitQueueBlockingPush(std::move(Item));
      continue; // Func goes out of scope and gets deleted
    }

    Func->translate();
-    std::unique_ptr<EmitterWorkItem> Item;
    if (Func->hasError()) {
      getErrorStatus()->assign(EC_Translation);
      OstreamLocker L(this);