diff options
| author | Matt Morehouse <mascasa@google.com> | 2018-10-02 18:35:44 +0000 |
|---|---|---|
| committer | Matt Morehouse <mascasa@google.com> | 2018-10-02 18:35:44 +0000 |
| commit | 4b1ec17fb030c065697993206aac3f9055348590 (patch) | |
| tree | 9a8ed196e50a8d57a4d16e997b3d3ccca2981f47 /llvm/lib/Target/X86/X86InstrInfo.cpp | |
| parent | 21d41dffe15b7cc2ff24015e674ce0c06e5e6a61 (diff) | |
| download | bcm5719-llvm-4b1ec17fb030c065697993206aac3f9055348590.tar.gz bcm5719-llvm-4b1ec17fb030c065697993206aac3f9055348590.zip | |
Revert "X86, AArch64, ARM: Do not attach debug location to spill/reload instructions"
This reverts r343520 due to breakage of HWASan tests on Android.
llvm-svn: 343616
Diffstat (limited to 'llvm/lib/Target/X86/X86InstrInfo.cpp')
| -rw-r--r-- | llvm/lib/Target/X86/X86InstrInfo.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/llvm/lib/Target/X86/X86InstrInfo.cpp b/llvm/lib/Target/X86/X86InstrInfo.cpp index 36ef7dca1f3..f69f6eff4d2 100644 --- a/llvm/lib/Target/X86/X86InstrInfo.cpp +++ b/llvm/lib/Target/X86/X86InstrInfo.cpp @@ -3313,7 +3313,8 @@ void X86InstrInfo::storeRegToStackSlot(MachineBasicBlock &MBB, (Subtarget.getFrameLowering()->getStackAlignment() >= Alignment) || RI.canRealignStack(MF); unsigned Opc = getStoreRegOpcode(SrcReg, RC, isAligned, Subtarget); - addFrameReference(BuildMI(MBB, MI, DebugLoc(), get(Opc)), FrameIdx) + DebugLoc DL = MBB.findDebugLoc(MI); + addFrameReference(BuildMI(MBB, MI, DL, get(Opc)), FrameIdx) .addReg(SrcReg, getKillRegState(isKill)); } @@ -3347,7 +3348,8 @@ void X86InstrInfo::loadRegFromStackSlot(MachineBasicBlock &MBB, (Subtarget.getFrameLowering()->getStackAlignment() >= Alignment) || RI.canRealignStack(MF); unsigned Opc = getLoadRegOpcode(DestReg, RC, isAligned, Subtarget); - addFrameReference(BuildMI(MBB, MI, DebugLoc(), get(Opc), DestReg), FrameIdx); + DebugLoc DL = MBB.findDebugLoc(MI); + addFrameReference(BuildMI(MBB, MI, DL, get(Opc), DestReg), FrameIdx); } void X86InstrInfo::loadRegFromAddr( |
