Subzero: Prototype to make use of RegNumT::No Register more concise

src/IceTargetLoweringARM32.cpp

Index: src/IceTargetLoweringARM32.cpp
diff --git a/src/IceTargetLoweringARM32.cpp b/src/IceTargetLoweringARM32.cpp
index 0b12bc6a8a60d4c776dfd2bd4e92d2445a83189f..2d2a85dc1b774d99382b52f3fb418440850d4bde 100644
--- a/src/IceTargetLoweringARM32.cpp
+++ b/src/IceTargetLoweringARM32.cpp
@@ -1183,7 +1183,7 @@ void TargetARM32::emitVariable(const Variable *Var) const {
   assert(!Var->isRematerializable());
   int32_t Offset = Var->getStackOffset();
   auto BaseRegNum = Var->getBaseRegNum();
-  if (BaseRegNum == RegNumT::NoRegister) {
+  if (BaseRegNum.hasNoValue()) {
     BaseRegNum = getFrameOrStackReg();
   }
   const Type VarTy = Var->getType();
@@ -5816,7 +5816,7 @@ Operand *TargetARM32::legalize(Operand *From, LegalMask Allowed,
   assert(Allowed & Legal_Reg);
 
   // Copied ipsis literis from TargetX86Base<Machine>.
-  if (RegNum == RegNumT::NoRegister) {
+  if (RegNum.hasNoValue()) {
     if (Variable *Subst = getContext().availabilityGet(From)) {
       // At this point we know there is a potential substitution available.
       if (!Subst->isRematerializable() && Subst->mustHaveReg() &&
@@ -6018,7 +6018,7 @@ Operand *TargetARM32::legalize(Operand *From, LegalMask Allowed,
     //   register, or
     //   RegNum is required and Var->getRegNum() doesn't match.
     if ((!(Allowed & Legal_Mem) && !MustHaveRegister) ||
-        (RegNum != RegNumT::NoRegister && RegNum != Var->getRegNum())) {
+        (RegNum.hasValue() && (RegNum != Var->getRegNum()))) {
       From = copyToReg(From, RegNum);
     }
     return From;
@@ -6085,9 +6085,9 @@ Variable64On32 *TargetARM32::makeI64RegPair() {
 Variable *TargetARM32::makeReg(Type Type, RegNumT RegNum) {
   // There aren't any 64-bit integer registers for ARM32.
   assert(Type != IceType_i64);
-  assert(AllowTemporaryWithNoReg || RegNum != RegNumT::NoRegister);
+  assert(AllowTemporaryWithNoReg || RegNum.hasValue());
   Variable *Reg = Func->makeVariable(Type);
-  if (RegNum == RegNumT::NoRegister)
+  if (RegNum.hasNoValue())

[Jim Stichnoth, 2016/02/12 18:29:54]

if (RegNum.hasValue())
  Reg->setRegNum(RegNum);
else
  Reg->setMustHaveReg();

[rkotlerimgtec, 2016/02/12 22:02:01]

Done.

[Jim Stichnoth, 2016/02/12 23:14:24]

Doesn't look done yet...

[rkotlerimgtec, 2016/02/13 00:56:53]

Done.

     Reg->setMustHaveReg();
   else
     Reg->setRegNum(RegNum);