diff options
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/lib/Target/X86/X86FrameLowering.cpp | 3 | ||||
| -rw-r--r-- | llvm/test/CodeGen/X86/segmented-stacks.ll | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/llvm/lib/Target/X86/X86FrameLowering.cpp b/llvm/lib/Target/X86/X86FrameLowering.cpp index 23b071673de..757cef2d7f7 100644 --- a/llvm/lib/Target/X86/X86FrameLowering.cpp +++ b/llvm/lib/Target/X86/X86FrameLowering.cpp @@ -1414,11 +1414,12 @@ X86FrameLowering::adjustForSegmentedStacks(MachineFunction &MF) const { if (!Is64Bit) BuildMI(allocMBB, DL, TII.get(X86::ADD32ri), X86::ESP).addReg(X86::ESP) .addImm(8); - BuildMI(allocMBB, DL, TII.get(X86::RET)); if (Is64Bit && IsNested) BuildMI(allocMBB, DL, TII.get(X86::MOV64rr), X86::R10).addReg(X86::RAX); + BuildMI(allocMBB, DL, TII.get(X86::RET)); + allocMBB->addSuccessor(&prologueMBB); checkMBB->addSuccessor(allocMBB); checkMBB->addSuccessor(&prologueMBB); diff --git a/llvm/test/CodeGen/X86/segmented-stacks.ll b/llvm/test/CodeGen/X86/segmented-stacks.ll index 3f0067e2926..37f082c730a 100644 --- a/llvm/test/CodeGen/X86/segmented-stacks.ll +++ b/llvm/test/CodeGen/X86/segmented-stacks.ll @@ -81,7 +81,7 @@ define i32 @test_nested(i32 * nest %closure, i32 %other) { ; X64-NEXT: movabsq $0, %r10 ; X64-NEXT: movabsq $0, %r11 ; X64-NEXT: callq __morestack -; X64-NEXT: ret ; X64-NEXT: movq %rax, %r10 +; X64-NEXT: ret } |
