Subzero: Refactor tracking of Defs and block-local Variables.

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.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file provides some of the support for the Liveness class.  In
@@ skipping 23 matching lines @@
   SizeT NumNodes = Func->getNumNodes();
   Nodes.resize(NumNodes);
   VarToLiveMap.resize(NumVars);
   if (Mode == Liveness_Intervals)
     LiveRanges.resize(NumVars);
 
   // Count the number of globals, and the number of locals for each
   // block.
   for (SizeT i = 0; i < NumVars; ++i) {
     Variable *Var = Func->getVariables()[i];
-    if (Var->isMultiblockLife()) {
+    if (Func->getVMetadata()->isMultiBlock(Var)) {
       ++NumGlobals;
     } else {
-      SizeT Index = Var->getLocalUseNode()->getIndex();
+      SizeT Index = Func->getVMetadata()->getLocalUseNode(Var)->getIndex();
       ++Nodes[Index].NumLocals;
     }
   }
 
   // Resize each LivenessNode::LiveToVarMap, and the global
   // LiveToVarMap.  Reset the counts to 0.
   for (SizeT i = 0; i < NumNodes; ++i) {
     Nodes[i].LiveToVarMap.assign(Nodes[i].NumLocals, NULL);
     Nodes[i].NumLocals = 0;
   }
   LiveToVarMap.assign(NumGlobals, NULL);
 
   // Sort each variable into the appropriate LiveToVarMap.  Also set
   // VarToLiveMap.
   SizeT TmpNumGlobals = 0;
   for (SizeT i = 0; i < NumVars; ++i) {
     Variable *Var = Func->getVariables()[i];
     SizeT VarIndex = Var->getIndex();
     SizeT LiveIndex;
-    if (Var->isMultiblockLife()) {
+    if (Func->getVMetadata()->isMultiBlock(Var)) {
       LiveIndex = TmpNumGlobals++;
       LiveToVarMap[LiveIndex] = Var;
     } else {
-      SizeT NodeIndex = Var->getLocalUseNode()->getIndex();
+      SizeT NodeIndex = Func->getVMetadata()->getLocalUseNode(Var)->getIndex();
       LiveIndex = Nodes[NodeIndex].NumLocals++;
       Nodes[NodeIndex].LiveToVarMap[LiveIndex] = Var;
       LiveIndex += NumGlobals;
     }
     VarToLiveMap[VarIndex] = LiveIndex;
   }
   assert(NumGlobals == TmpNumGlobals);
 
   // Process each node.
   const NodeList &LNodes = Func->getNodes();
@@ skipping 25 matching lines @@
   assert(WeightDelta != RegWeight::Inf);
   LiveRange.addSegment(Start, End);
   LiveRange.addWeight(WeightDelta);
 }
 
 LiveRange &Liveness::getLiveRange(Variable *Var) {
   return LiveRanges[Var->getIndex()];
 }
 
 } // end of namespace Ice