diff options
| author | Logan Chien <loganchien@google.com> | 2011-11-25 08:46:08 +0800 |
|---|---|---|
| committer | Logan Chien <loganchien@google.com> | 2011-11-25 13:43:44 +0800 |
| commit | 1429059dc0129c1cec938c29d6fce89e14293241 (patch) | |
| tree | ec4c55e5138c7eb9ad0313d4af895ad0c56d0978 /lib/CodeGen/TargetInstrInfoImpl.cpp | |
| parent | 1035c3e84815607b4f8994cab03ae62cc8519a63 (diff) | |
| parent | 705f2431a086bbe662bca0035938e774378de3ec (diff) | |
| download | external_llvm-1429059dc0129c1cec938c29d6fce89e14293241.zip external_llvm-1429059dc0129c1cec938c29d6fce89e14293241.tar.gz external_llvm-1429059dc0129c1cec938c29d6fce89e14293241.tar.bz2 | |
Merge with LLVM upstream r145126 (Nov 25th 2011)
Change-Id: I30d08ae004a4c3c74092ad2537ab30cce4280e1d
Diffstat (limited to 'lib/CodeGen/TargetInstrInfoImpl.cpp')
| -rw-r--r-- | lib/CodeGen/TargetInstrInfoImpl.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/CodeGen/TargetInstrInfoImpl.cpp b/lib/CodeGen/TargetInstrInfoImpl.cpp index f32678f..08e2b16 100644 --- a/lib/CodeGen/TargetInstrInfoImpl.cpp +++ b/lib/CodeGen/TargetInstrInfoImpl.cpp @@ -296,8 +296,7 @@ TargetInstrInfo::foldMemoryOperand(MachineBasicBlock::iterator MI, const MachineFrameInfo &MFI = *MF.getFrameInfo(); assert(MFI.getObjectOffset(FI) != -1); MachineMemOperand *MMO = - MF.getMachineMemOperand( - MachinePointerInfo(PseudoSourceValue::getFixedStack(FI)), + MF.getMachineMemOperand(MachinePointerInfo::getFixedStack(FI), Flags, MFI.getObjectSize(FI), MFI.getObjectAlignment(FI)); NewMI->addMemOperand(MF, MMO); |