diff options
| author | Michael Kuperstein <michael.m.kuperstein@intel.com> | 2015-02-01 16:15:07 +0000 |
|---|---|---|
| committer | Michael Kuperstein <michael.m.kuperstein@intel.com> | 2015-02-01 16:15:07 +0000 |
| commit | e86aa9a8a455f90bf3d6dc567b9e39b2e4510246 (patch) | |
| tree | e727b02e6da5596b9d3cce6b6f77155337ae2aa3 /llvm/lib/Target/X86/X86RegisterInfo.cpp | |
| parent | e6698d5305a29a186e035ab737931a139d70bcd2 (diff) | |
| download | bcm5719-llvm-e86aa9a8a455f90bf3d6dc567b9e39b2e4510246.tar.gz bcm5719-llvm-e86aa9a8a455f90bf3d6dc567b9e39b2e4510246.zip | |
Revert r227728 due to bad line endings.
llvm-svn: 227746
Diffstat (limited to 'llvm/lib/Target/X86/X86RegisterInfo.cpp')
| -rw-r--r-- | llvm/lib/Target/X86/X86RegisterInfo.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/llvm/lib/Target/X86/X86RegisterInfo.cpp b/llvm/lib/Target/X86/X86RegisterInfo.cpp index 0fa38f45370..09e651cebfb 100644 --- a/llvm/lib/Target/X86/X86RegisterInfo.cpp +++ b/llvm/lib/Target/X86/X86RegisterInfo.cpp @@ -468,6 +468,8 @@ void X86RegisterInfo::eliminateFrameIndex(MachineBasicBlock::iterator II, int SPAdj, unsigned FIOperandNum, RegScavenger *RS) const { + assert(SPAdj == 0 && "Unexpected"); + MachineInstr &MI = *II; MachineFunction &MF = *MI.getParent()->getParent(); const TargetFrameLowering *TFI = MF.getSubtarget().getFrameLowering(); @@ -504,9 +506,6 @@ X86RegisterInfo::eliminateFrameIndex(MachineBasicBlock::iterator II, } else FIOffset = TFI->getFrameIndexOffset(MF, FrameIndex); - if (BasePtr == StackPtr) - FIOffset += SPAdj; - // The frame index format for stackmaps and patchpoints is different from the // X86 format. It only has a FI and an offset. if (Opc == TargetOpcode::STACKMAP || Opc == TargetOpcode::PATCHPOINT) { |
