Refactor Lo and Hi out of Variable.

src/IceCfg.cpp

 //===- subzero/src/IceCfg.cpp - Control flow graph implementation ---------===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
@@ skipping 57 matching lines @@
   return Node;
 }
 
 void Cfg::swapNodes(NodeList &NewNodes) {
   assert(Nodes.size() == NewNodes.size());
   Nodes.swap(NewNodes);
   for (SizeT I = 0, NumNodes = getNumNodes(); I < NumNodes; ++I)
     Nodes[I]->resetIndex(I);
 }
 
+template <>
+Variable *Cfg::makeVariable<Variable>(Type Ty) {
+  SizeT Index = Variables.size();
+  Variable *Var = Target->shouldSplitToVariable64On32(Ty)
+                      ? Variable64On32::create(this, Ty, Index)
+                      : Variable::create(this, Ty, Index);
+  Variables.push_back(Var);
+  return Var;
+}
+
 void Cfg::addArg(Variable *Arg) {
   Arg->setIsArg();
   Args.push_back(Arg);
 }
 
 void Cfg::addImplicitArg(Variable *Arg) {
   Arg->setIsImplicitArg();
   ImplicitArgs.push_back(Arg);
 }
 
@@ skipping 80 matching lines @@
       getContext()->resetTimer(GlobalContext::TSK_Default);
       getContext()->setTimerName(GlobalContext::TSK_Default, Name);
     }
     if (getContext()->getFlags().getTimeEachFunction())
       FunctionTimer.reset(new TimerMarker(
           getContext()->getTimerID(GlobalContext::TSK_Funcs, Name),
           getContext(), GlobalContext::TSK_Funcs));
   }
   TimerMarker T(TimerStack::TT_translate, this);
 
+  // Create the Hi and Lo variables where a split was needed
+  for (Variable *Var : Variables)
+    if (auto Var64On32 = llvm::dyn_cast<Variable64On32>(Var))
+      Var64On32->initHiLo(this);
+
   dump("Initial CFG");
 
   if (getContext()->getFlags().getEnableBlockProfile()) {
     profileBlocks();
     // TODO(jpp): this is fragile, at best. Figure out a better way of
     // detecting exit functions.
     if (GlobalContext::matchSymbolName(getFunctionName(), "exit")) {
       addCallToProfileSummary();
     }
     dump("Profiled CFG");
@@ skipping 585 matching lines @@
     }
   }
   // Print each basic block
   for (CfgNode *Node : Nodes)
     Node->dump(this);
   if (isVerbose(IceV_Instructions))
     Str << "}\n";
 }
 
 } // end of namespace Ice