diff options
| -rw-r--r-- | llvm/lib/MC/MCStreamer.cpp | 2 | ||||
| -rw-r--r-- | llvm/lib/Target/X86/X86FrameLowering.cpp | 11 | ||||
| -rw-r--r-- | llvm/test/MC/COFF/seh-stackalloc-zero.s | 11 |
3 files changed, 20 insertions, 4 deletions
diff --git a/llvm/lib/MC/MCStreamer.cpp b/llvm/lib/MC/MCStreamer.cpp index eca1ed7d7fe..bdcdb970cc1 100644 --- a/llvm/lib/MC/MCStreamer.cpp +++ b/llvm/lib/MC/MCStreamer.cpp @@ -515,6 +515,8 @@ void MCStreamer::EmitWinCFISetFrame(unsigned Register, unsigned Offset) { void MCStreamer::EmitWinCFIAllocStack(unsigned Size) { EnsureValidW64UnwindInfo(); + if (Size == 0) + report_fatal_error("Allocation size must be non-zero!"); if (Size & 7) report_fatal_error("Misaligned stack allocation!"); MCWin64EHUnwindInfo *CurFrame = CurrentW64UnwindInfo; diff --git a/llvm/lib/Target/X86/X86FrameLowering.cpp b/llvm/lib/Target/X86/X86FrameLowering.cpp index 1544549e5e9..8c029a8c22d 100644 --- a/llvm/lib/Target/X86/X86FrameLowering.cpp +++ b/llvm/lib/Target/X86/X86FrameLowering.cpp @@ -751,10 +751,13 @@ void X86FrameLowering::emitPrologue(MachineFunction &MF) const { SEHFrameOffset += SEHFrameOffset % 16; // ensure alignmant // This only needs to account for XMM spill slots, GPR slots - // are covered by .seh_pushreg's emitted above. - BuildMI(MBB, MBBI, DL, TII.get(X86::SEH_StackAlloc)) - .addImm(SEHFrameOffset - X86FI->getCalleeSavedFrameSize()) - .setMIFlag(MachineInstr::FrameSetup); + // are covered by the .seh_pushreg's emitted above. + unsigned Size = SEHFrameOffset - X86FI->getCalleeSavedFrameSize(); + if (Size) { + BuildMI(MBB, MBBI, DL, TII.get(X86::SEH_StackAlloc)) + .addImm(Size) + .setMIFlag(MachineInstr::FrameSetup); + } BuildMI(MBB, MBBI, DL, TII.get(X86::SEH_SetFrame)) .addImm(FramePtr) diff --git a/llvm/test/MC/COFF/seh-stackalloc-zero.s b/llvm/test/MC/COFF/seh-stackalloc-zero.s new file mode 100644 index 00000000000..898ac844417 --- /dev/null +++ b/llvm/test/MC/COFF/seh-stackalloc-zero.s @@ -0,0 +1,11 @@ +// RUN: not llvm-mc -triple x86_64-pc-win32 -filetype=obj %s -o %t.o 2>&1 | FileCheck %s + +// CHECK: Allocation size must be non-zero! + + .globl smallFunc + .def smallFunc; .scl 2; .type 32; .endef + .seh_proc smallFunc + .seh_stackalloc 0 +smallFunc: + ret + .seh_endproc |
