Subzero: Merge SpillVariable functionality directly into Variable.

src/IceOperand.cpp

 //===- subzero/src/IceOperand.cpp - High-level operand implementation -----===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
@@ skipping 180 matching lines @@
     ++TrimmedBegin;
 }
 
 const Variable *Variable::asType(const Cfg *Func, Type Ty,
                                  RegNumT NewRegNum) const {
   // Note: This returns a Variable, even if the "this" object is a subclass of
   // Variable.
   if (!BuildDefs::dump() || getType() == Ty)
     return this;
   static constexpr SizeT One = 1;
-  Variable *V = new (CfgLocalAllocator<Variable>().allocate(One))
+  auto *V = new (CfgLocalAllocator<Variable>().allocate(One))
       Variable(Func, kVariable, Ty, Number);
   V->Name = Name;
   V->RegNum = NewRegNum.hasValue() ? NewRegNum : RegNum;
   V->StackOffset = StackOffset;
+  V->LinkedTo = LinkedTo;
   return V;
 }
 
 RegWeight Variable::getWeight(const Cfg *Func) const {
   VariablesMetadata *VMetadata = Func->getVMetadata();
   return mustHaveReg() ? RegWeight(RegWeight::Inf)
                        : mustNotHaveReg() ? RegWeight(RegWeight::Zero)
                                           : VMetadata->getUseWeight(this);
 }
 
@@ skipping 314 matching lines @@
 }
 
 void Variable::dump(const Cfg *Func, Ostream &Str) const {
   if (!BuildDefs::dump())
     return;
   if (Func == nullptr) {
     Str << "%" << getName();
     return;
   }
   if (Func->isVerbose(IceV_RegOrigins) ||
-      (!hasReg() && !Func->getTarget()->hasComputedFrame()))
+      (!hasReg() && !Func->getTarget()->hasComputedFrame())) {
     Str << "%" << getName();
+    if (getLinkedTo() != nullptr)
+      Str << ":%" << getLinkedTo()->getName();
+  }
   if (hasReg()) {
     if (Func->isVerbose(IceV_RegOrigins))
       Str << ":";
     Str << Func->getTarget()->getRegName(RegNum, getType());
   } else if (Func->getTarget()->hasComputedFrame()) {
     if (Func->isVerbose(IceV_RegOrigins))
       Str << ":";
     const auto BaseRegisterNumber =
         hasReg() ? getBaseRegNum() : Func->getTarget()->getFrameOrStackReg();
     Str << "["
@@ skipping 91 matching lines @@
   if (getType() != IceType_i32 && getType() != IceType_i16 &&
       getType() != IceType_i8)
     return false;
   // The Following checks if the signed representation of Value is between
   // -Threshold/2 and +Threshold/2
   bool largerThanThreshold = Threshold / 2 + Value >= Threshold;
   return largerThanThreshold;
 }
 
 } // end of namespace Ice