diff options
author | Nikita Popov <nikita.ppv@gmail.com> | 2019-04-20 07:25:46 +0000 |
---|---|---|
committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-04-20 07:25:46 +0000 |
commit | b75c8fc6fbac57e0bde233516fa125f65b36af84 (patch) | |
tree | df835d745d4a007ab4503ee149c6073fe6b21d1d /llvm/lib/Target/X86/X86FrameLowering.cpp | |
parent | ce12ea8dfc371735672342f2dcc6ecfb32e3b4d7 (diff) | |
download | bcm5719-llvm-b75c8fc6fbac57e0bde233516fa125f65b36af84.tar.gz bcm5719-llvm-b75c8fc6fbac57e0bde233516fa125f65b36af84.zip |
[X86] Fix stack probing on x32 (PR41477)
Fix for https://bugs.llvm.org/show_bug.cgi?id=41477. On the x32 ABI
with stack probing a dynamic alloca will result in a WIN_ALLOCA_32
with a 32-bit size. The current implementation tries to copy it into
RAX, resulting in a physreg copy error. Fix this by copying to EAX
instead. Also fix incorrect opcodes or registers used in subs.
llvm-svn: 358807
Diffstat (limited to 'llvm/lib/Target/X86/X86FrameLowering.cpp')
-rw-r--r-- | llvm/lib/Target/X86/X86FrameLowering.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/llvm/lib/Target/X86/X86FrameLowering.cpp b/llvm/lib/Target/X86/X86FrameLowering.cpp index 7a28709be7b..581df4345a7 100644 --- a/llvm/lib/Target/X86/X86FrameLowering.cpp +++ b/llvm/lib/Target/X86/X86FrameLowering.cpp @@ -794,8 +794,8 @@ void X86FrameLowering::emitStackProbeCall(MachineFunction &MF, .addExternalSymbol(MF.createExternalSymbolName(Symbol)); } - unsigned AX = Is64Bit ? X86::RAX : X86::EAX; - unsigned SP = Is64Bit ? X86::RSP : X86::ESP; + unsigned AX = Uses64BitFramePtr ? X86::RAX : X86::EAX; + unsigned SP = Uses64BitFramePtr ? X86::RSP : X86::ESP; CI.addReg(AX, RegState::Implicit) .addReg(SP, RegState::Implicit) .addReg(AX, RegState::Define | RegState::Implicit) @@ -809,7 +809,7 @@ void X86FrameLowering::emitStackProbeCall(MachineFunction &MF, // adjusting %rsp. // All other platforms do not specify a particular ABI for the stack probe // function, so we arbitrarily define it to not adjust %esp/%rsp itself. - BuildMI(MBB, MBBI, DL, TII.get(getSUBrrOpcode(Is64Bit)), SP) + BuildMI(MBB, MBBI, DL, TII.get(getSUBrrOpcode(Uses64BitFramePtr)), SP) .addReg(SP) .addReg(AX); } |