Operand 1 should be a register. We don't care if it's a preg, vreg, or 0.

llvm-svn: 45699

1 files changed, 9 insertions, 13 deletions

diff --git a/llvm/lib/Target/X86/X86InstrInfo.cpp b/llvm/lib/Target/X86/X86InstrInfo.cpp
index 42e41279f60..a24140cb0d5 100644
--- a/llvm/lib/Target/X86/X86InstrInfo.cpp
+++ b/llvm/lib/Target/X86/X86InstrInfo.cpp
@@ -771,19 +771,15 @@ bool X86InstrInfo::isReallySideEffectFree(MachineInstr *MI) const {
   switch (MI->getOpcode()) {
   default: break;
   case X86::MOV32rm:
-    if (MI->getOperand(1).isRegister()) {
-      unsigned Reg = MI->getOperand(1).getReg();
-      const X86Subtarget &ST = TM.getSubtarget<X86Subtarget>();
-
-      // Loads from stubs of global addresses are side effect free.
-      if (Reg != 0 && MRegisterInfo::isVirtualRegister(Reg) &&
-          MI->getOperand(2).isImm() && MI->getOperand(3).isReg() &&
-          MI->getOperand(4).isGlobal() &&
-          ST.GVRequiresExtraLoad(MI->getOperand(4).getGlobal(), TM, false) &&
-          MI->getOperand(2).getImm() == 1 &&
-          MI->getOperand(3).getReg() == 0)
-        return true;
-    }
+    // Loads from stubs of global addresses are side effect free.
+    if (MI->getOperand(1).isReg() &&
+        MI->getOperand(2).isImm() && MI->getOperand(3).isReg() &&
+        MI->getOperand(4).isGlobal() &&
+        TM.getSubtarget<X86Subtarget>().GVRequiresExtraLoad
+          (MI->getOperand(4).getGlobal(), TM, false) &&
+        MI->getOperand(2).getImm() == 1 &&
+        MI->getOperand(3).getReg() == 0)
+      return true;
     // FALLTHROUGH
   case X86::MOV8rm:
   case X86::MOV16rm: