Suzero. X8664. NaCl Sandboxing.

src/IceLiveness.cpp

Index: src/IceLiveness.cpp
diff --git a/src/IceLiveness.cpp b/src/IceLiveness.cpp
index 2bfa624d57cf03f5c3855648871e9b30291a7e7f..8462ba967d422c34101d55467787985cb80648f7 100644
--- a/src/IceLiveness.cpp
+++ b/src/IceLiveness.cpp
@@ -57,9 +57,23 @@ void Liveness::initInternal(NodeList::const_iterator FirstNode,
   }
   if (IsFullInit)
     NumGlobals = TmpNumGlobals;
-  else
+  else {
+    if (TmpNumGlobals != 0) {

[Jim Stichnoth, 2016/01/13 18:28:26]

Did you mean to leave this here?  If so, it needs to be guarded by
BuildDefs::dump() and some isVerbose() check.

[John, 2016/01/13 20:48:03]

Done.

+      Ostream &Str = Func->getContext()->getStrDump();
+      for (auto I = FirstVar, E = Func->getVariables().end(); I != E; ++I) {
+        Variable *Var = *I;
+        if (VMetadata->isMultiBlock(Var)) {
+          Str << " Multiblock: ";
+        } else {
+          Str << "!Multiblock: ";
+        }
+        Var->dump(Str);
+        Str << "\n";
+      }
+      Func->dump();
+    }
     assert(TmpNumGlobals == 0);
-
+  }
   // Resize each LivenessNode::LiveToVarMap, and the global LiveToVarMap. Reset
   // the counts to 0.
   for (auto I = FirstNode, E = Func->getNodes().end(); I != E; ++I) {