Subzero: Remove the LEAHACK workarounds.

src/IceTargetLoweringX8632.cpp

Index: src/IceTargetLoweringX8632.cpp
diff --git a/src/IceTargetLoweringX8632.cpp b/src/IceTargetLoweringX8632.cpp
index 881bb149a7391104c6200ff23252f845a73cb1a2..f06c2e4ca09dc2332c12cc2b6dc745de01adde43 100644
--- a/src/IceTargetLoweringX8632.cpp
+++ b/src/IceTargetLoweringX8632.cpp
@@ -509,6 +509,8 @@ void TargetX8632::emitVariable(const Variable *Var) const {
     Str << "%" << getRegName(Var->getRegNum(), Var->getType());
     return;
   }
+  if (Var->getWeight().isInf())
+    llvm_unreachable("Infinite-weight Variable has no register assigned");
   const Type Ty = IceType_i32;
   int32_t Offset = Var->getStackOffset();
   if (!hasFramePointer())
@@ -519,7 +521,10 @@ void TargetX8632::emitVariable(const Variable *Var) const {
 }
 
 x86::Address TargetX8632::stackVarToAsmOperand(const Variable *Var) const {

[jvoung (off chromium), 2014/11/02 17:37:52]

Hmm I was seeing an assert recently building mesa, maybe it was related to this.
A mov instruction w/ a stack as dest, but the src didn't get a register or
something. Seems fixed after trying this patch locally.

[Jim Stichnoth, 2014/11/02 18:04:28]

Yeah, sorry about that... I was always in the habit of building spec2k with
-build-on-read=0, whereas -build-on-read=1 would lead to an assertion failure
somewhere else in the integrated assembler, and invalid assembly from the text
asm emitter.

This isn't the ideal place to catch these errors, but at least they should be
caught reliably now.

-  assert(!Var->hasReg());
+  if (Var->hasReg())
+    llvm_unreachable("Stack Variable has a register assigned");
+  if (Var->getWeight().isInf())
+    llvm_unreachable("Infinite-weight Variable has no register assigned");
   int32_t Offset = Var->getStackOffset();
   if (!hasFramePointer())
     Offset += getStackAdjustment();
@@ -1850,9 +1855,7 @@ void TargetX8632::lowerCall(const InstCall *Instr) {
       break;
     }
   }
-  // TODO(stichnot): LEAHACK: remove Legal_All (and use default) once
-  // a proper emitter is used.
-  Operand *CallTarget = legalize(Instr->getCallTarget(), Legal_All);
+  Operand *CallTarget = legalize(Instr->getCallTarget());
   Inst *NewCall = InstX8632Call::create(Func, ReturnReg, CallTarget);
   Context.insert(NewCall);
   if (ReturnRegHi)
@@ -4407,11 +4410,6 @@ Operand *TargetX8632::legalize(Operand *From, LegalMask Allowed,
     if (!(Allowed & Legal_Imm))
       // Immediate specifically not allowed
       NeedsReg = true;
-    // TODO(stichnot): LEAHACK: remove Legal_Reloc once a proper
-    // emitter is used.
-    if (!(Allowed & Legal_Reloc) && llvm::isa<ConstantRelocatable>(From))
-      // Relocatable specifically not allowed
-      NeedsReg = true;
     if (!(Allowed & Legal_Mem) && isScalarFloatingType(From->getType()))
       // On x86, FP constants are lowered to mem operands.
       NeedsReg = true;