summaryrefslogtreecommitdiff
path: root/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
diff options
context:
space:
mode:
authorReid Kleckner <reid@kleckner.net>2013-12-10 05:31:27 +0000
committerReid Kleckner <reid@kleckner.net>2013-12-10 05:31:27 +0000
commitcc8d39acf5b16939d656ea8b6d755738bc3266d0 (patch)
treeac2b4dc2c9bebaf2286b995da954267ba58ecee3 /lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
parentec4d326aad404fa7a6335aadcc21710ecc6a63b0 (diff)
downloadllvm-cc8d39acf5b16939d656ea8b6d755738bc3266d0.tar.gz
llvm-cc8d39acf5b16939d656ea8b6d755738bc3266d0.tar.bz2
llvm-cc8d39acf5b16939d656ea8b6d755738bc3266d0.tar.xz
Revert "Fix miscompile of MS inline assembly with stack realignment"
This reverts commit r196876. Its tests failed on the bots, so I'll figure it out tomorrow. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@196879 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp')
-rw-r--r--lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp10
1 files changed, 1 insertions, 9 deletions
diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
index b3cbd91838..34b7df59ac 100644
--- a/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
@@ -851,20 +851,12 @@ void RegsForValue::AddInlineAsmOperands(unsigned Code, bool HasMatching,
SDValue Res = DAG.getTargetConstant(Flag, MVT::i32);
Ops.push_back(Res);
- unsigned SP = TLI.getStackPointerRegisterToSaveRestore();
for (unsigned Value = 0, Reg = 0, e = ValueVTs.size(); Value != e; ++Value) {
unsigned NumRegs = TLI.getNumRegisters(*DAG.getContext(), ValueVTs[Value]);
MVT RegisterVT = RegVTs[Value];
for (unsigned i = 0; i != NumRegs; ++i) {
assert(Reg < Regs.size() && "Mismatch in # registers expected");
- unsigned TheReg = Regs[Reg++];
- Ops.push_back(DAG.getRegister(TheReg, RegisterVT));
-
- // Notice if we clobbered the stack pointer. Yes, inline asm can do this.
- if (TheReg == SP && Code == InlineAsm::Kind_Clobber) {
- MachineFrameInfo *MFI = DAG.getMachineFunction().getFrameInfo();
- MFI->setHasInlineAsmWithSPAdjust(true);
- }
+ Ops.push_back(DAG.getRegister(Regs[Reg++], RegisterVT));
}
}
}