Handle the global address case here, not just the offset case.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@19487 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Target/X86/X86PeepholeOpt.cpp b/lib/Target/X86/X86PeepholeOpt.cpp
index d041480..9d02cbd 100644
--- a/lib/Target/X86/X86PeepholeOpt.cpp
+++ b/lib/Target/X86/X86PeepholeOpt.cpp
@@ -191,10 +191,17 @@
unsigned R0 = MI->getOperand(0).getReg();
unsigned Scale = MI->getOperand(1).getImmedValue();
unsigned R1 = MI->getOperand(2).getReg();
- unsigned Offset = MI->getOperand(3).getImmedValue();
- I = MBB.insert(MBB.erase(I),
- BuildMI(Opcode, 5).addReg(R0).addZImm(Scale).
- addReg(R1).addSImm(Offset).addZImm((char)Val));
+ if (MI->getOperand(3).isImmediate()) {
+ unsigned Offset = MI->getOperand(3).getImmedValue();
+ I = MBB.insert(MBB.erase(I),
+ BuildMI(Opcode, 5).addReg(R0).addZImm(Scale).
+ addReg(R1).addSImm(Offset).addZImm((char)Val));
+ } else if (MI->getOperand(3).isGlobalAddress()) {
+ GlobalValue *GA = MI->getOperand(3).getGlobal();
+ I = MBB.insert(MBB.erase(I),
+ BuildMI(Opcode, 5).addReg(R0).addZImm(Scale).
+ addReg(R1).addGlobalAddress(GA).addZImm((char)Val));
+ }
return true;
}
}