[llvm-commits] [llvm] r141856 - in /llvm/trunk: lib/Target/X86/X86FrameLowering.cpp test/CodeGen/X86/segmented-stacks.ll

[Bill Wendling]

Author: void
Date: Thu Oct 13 02:42:32 2011
New Revision: 141856

URL: http://llvm.org/viewvc/llvm-project?rev=141856&view=rev
Log:
Should not add instructions to a BB after a return instruction. The machine instruction verifier doesn't like this, nor do I.

Modified:
    llvm/trunk/lib/Target/X86/X86FrameLowering.cpp
    llvm/trunk/test/CodeGen/X86/segmented-stacks.ll

Modified: llvm/trunk/lib/Target/X86/X86FrameLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86FrameLowering.cpp?rev=141856&r1=141855&r2=141856&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/X86FrameLowering.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86FrameLowering.cpp Thu Oct 13 02:42:32 2011
@@ -1414,11 +1414,12 @@
   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);

Modified: llvm/trunk/test/CodeGen/X86/segmented-stacks.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/segmented-stacks.ll?rev=141856&r1=141855&r2=141856&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/segmented-stacks.ll (original)
+++ llvm/trunk/test/CodeGen/X86/segmented-stacks.ll Thu Oct 13 02:42:32 2011
@@ -81,7 +81,7 @@
 ; 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
 
 }