Suzero. X8664. NaCl Sandboxing.

src/IceLiveness.cpp

 //===- subzero/src/IceLiveness.cpp - Liveness analysis implementation -----===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
@@ skipping 37 matching lines @@
   SizeT TmpNumGlobals = 0;
   for (auto I = FirstVar, E = Func->getVariables().end(); I != E; ++I) {
     Variable *Var = *I;
     if (VMetadata->isMultiBlock(Var)) {
       ++TmpNumGlobals;
     } else {
       SizeT Index = VMetadata->getLocalUseNode(Var)->getIndex();
       ++Nodes[Index].NumLocals;
     }
   }
-  if (IsFullInit)
+  if (IsFullInit) {

[Jim Stichnoth, 2016/01/14 00:09:52]

I would just revert this change completely in this CL.

[John, 2016/01/14 23:18:25]

This was on the spirit of last afternoon's discussion about no having
single-line ifs without { }.

Done, though.

     NumGlobals = TmpNumGlobals;
-  else
+  } else {
     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) {
     LivenessNode &N = Nodes[(*I)->getIndex()];
     N.LiveToVarMap.assign(N.NumLocals, nullptr);
     N.NumLocals = 0;
     N.NumNonDeadPhis = 0;
   }
   if (IsFullInit)
     LiveToVarMap.assign(NumGlobals, nullptr);
@@ skipping 57 matching lines @@
 }
 
 Variable *Liveness::getVariable(SizeT LiveIndex, const CfgNode *Node) const {
   if (LiveIndex < NumGlobals)
     return LiveToVarMap[LiveIndex];
   SizeT NodeIndex = Node->getIndex();
   return Nodes[NodeIndex].LiveToVarMap[LiveIndex - NumGlobals];
 }
 
 } // end of namespace Ice