Skip to content
This repository was archived by the owner on Feb 5, 2019. It is now read-only.

Commit 202adef

Browse files
whitequarkalexcrichton
authored andcommitted
[X86] Fix SP adjustment in stack probes emitted on 32-bit Windows.
Commit r306010 adjusted the condition as follows: - if (Is64Bit) { + if (!STI.isTargetWin32()) { The intent was to preserve the behavior on all Windows platforms but extend the behavior on 64-bit Windows platforms to every other one. (Before r306010, emitStackProbeCall only ever executed when emitting code for Windows triples.) Unfortunately, if (Is64Bit && STI.isOSWindows()) is not the same as if (!STI.isTargetWin32()) because of the way isTargetWin32() is defined: bool isTargetWin32() const { return !In64BitMode && (isTargetCygMing() || isTargetKnownWindowsMSVC()); } In practice this broke the JIT tests on 32-bit Windows, which did not satisfy the new condition: LLVM :: ExecutionEngine/MCJIT/2003-01-15-AlignmentTest.ll LLVM :: ExecutionEngine/MCJIT/2003-08-15-AllocaAssertion.ll LLVM :: ExecutionEngine/MCJIT/2003-08-23-RegisterAllocatePhysReg.ll LLVM :: ExecutionEngine/MCJIT/test-loadstore.ll LLVM :: ExecutionEngine/OrcMCJIT/2003-01-15-AlignmentTest.ll LLVM :: ExecutionEngine/OrcMCJIT/2003-08-15-AllocaAssertion.ll LLVM :: ExecutionEngine/OrcMCJIT/2003-08-23-RegisterAllocatePhysReg.ll LLVM :: ExecutionEngine/OrcMCJIT/test-loadstore.ll because %esp was not updated correctly. The failures are only visible on a MSVC 2017 Debug build, for which we do not have bots. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@306142 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent 8e1b4fe commit 202adef

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

lib/Target/X86/X86FrameLowering.cpp

+5-2
Original file line numberDiff line numberDiff line change
@@ -745,10 +745,13 @@ void X86FrameLowering::emitStackProbeCall(MachineFunction &MF,
745745
.addReg(SP, RegState::Define | RegState::Implicit)
746746
.addReg(X86::EFLAGS, RegState::Define | RegState::Implicit);
747747

748-
if (!STI.isTargetWin32()) {
748+
if (STI.isTargetWin64() || !STI.isOSWindows()) {
749+
// MSVC x32's _chkstk and cygwin/mingw's _alloca adjust %esp themselves.
749750
// MSVC x64's __chkstk and cygwin/mingw's ___chkstk_ms do not adjust %rsp
750-
// themselves. It also does not clobber %rax so we can reuse it when
751+
// themselves. They also does not clobber %rax so we can reuse it when
751752
// adjusting %rsp.
753+
// All other platforms do not specify a particular ABI for the stack probe
754+
// function, so we arbitrarily define it to not adjust %esp/%rsp itself.
752755
BuildMI(MBB, MBBI, DL, TII.get(getSUBrrOpcode(Is64Bit)), SP)
753756
.addReg(SP)
754757
.addReg(AX);

0 commit comments

Comments
 (0)