[llvm] r247944 - [WinEH] Fix tests broken by funclet-layout

[David Majnemer via llvm-commits]

Author: majnemer
Date: Thu Sep 17 16:11:12 2015
New Revision: 247944

URL: http://llvm.org/viewvc/llvm-project?rev=247944&view=rev
Log:
[WinEH] Fix tests broken by funclet-layout

Modified:
    llvm/trunk/test/CodeGen/X86/win-catchpad-csrs.ll
    llvm/trunk/test/CodeGen/X86/win-catchpad.ll

Modified: llvm/trunk/test/CodeGen/X86/win-catchpad-csrs.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/win-catchpad-csrs.ll?rev=247944&r1=247943&r2=247944&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/win-catchpad-csrs.ll (original)
+++ llvm/trunk/test/CodeGen/X86/win-catchpad-csrs.ll Thu Sep 17 16:11:12 2015
@@ -66,6 +66,11 @@ catchendblock:
 ; X86: popl %ebp
 ; X86: retl
 
+; X86: [[restorebb:LBB0_[0-9]+]]:
+; X86: movl -16(%ebp), %esp
+; X86: addl $12, %ebp
+; X86: jmp [[contbb]]
+
 ; X86: [[catch1bb:LBB0_[0-9]+]]: # %catch{{$}}
 ; X86: pushl %ebp
 ; X86-NOT: pushl
@@ -76,15 +81,9 @@ catchendblock:
 ; X86: calll _f
 ; X86: addl $16, %esp
 ; X86-NEXT: popl %ebp
-; X86-NEXT: movl $[[restorebb:LBB0_[0-9]+]], %eax
+; X86-NEXT: movl $[[restorebb]], %eax
 ; X86-NEXT: retl
 
-; FIXME: Lay this out in the parent funclet.
-; X86: [[restorebb]]:
-; X86: movl -16(%ebp), %esp
-; X86: addl $12, %ebp
-; X86: jmp [[contbb]]
-
 ; X86: L__ehtable$try_catch_catch:
 ; X86: $handlerMap$0$try_catch_catch:
 ; X86:   .long   0

Modified: llvm/trunk/test/CodeGen/X86/win-catchpad.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/win-catchpad.ll?rev=247944&r1=247943&r2=247944&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/win-catchpad.ll (original)
+++ llvm/trunk/test/CodeGen/X86/win-catchpad.ll Thu Sep 17 16:11:12 2015
@@ -73,6 +73,11 @@ catchendblock:
 ; X86: [[contbb:LBB0_[0-9]+]]: # %try.cont
 ; X86: retl
 
+; X86: [[restorebb:LBB0_[0-9]+]]: # %invoke.cont.3
+; X86: movl -16(%ebp), %esp
+; X86: addl $12, %ebp
+; X86: jmp [[contbb]]
+
 ; X86: [[catch1bb:LBB0_[0-9]+]]: # %catch{{$}}
 ; X86: pushl %ebp
 ; X86: addl $12, %ebp
@@ -85,7 +90,7 @@ catchendblock:
 ; X86: calll _f
 ; X86-NEXT: addl $8, %esp
 ; X86-NEXT: popl %ebp
-; X86-NEXT: movl $[[restorebb:LBB0_[0-9]+]], %eax
+; X86-NEXT: movl $[[restorebb]], %eax
 ; X86-NEXT: retl
 
 ; X86: [[catch2bb:LBB0_[0-9]+]]: # %catch.2{{$}}
@@ -102,12 +107,6 @@ catchendblock:
 ; X86-NEXT: movl $[[restorebb]], %eax
 ; X86-NEXT: retl
 
-; FIXME: We should lay this code out up with the parent function.
-; X86: [[restorebb]]:
-; X86: movl -16(%ebp), %esp
-; X86: addl $12, %ebp
-; X86: jmp [[contbb]]
-
 ; X86: L__ehtable$try_catch_catch:
 ; X86: $handlerMap$0$try_catch_catch:
 ; X86-NEXT:   .long   0