From: David Majnemer <david.majnemer@gmail.com>
Date: Thu, 17 Sep 2015 21:11:12 +0000 (+0000)
Subject: [WinEH] Fix tests broken by funclet-layout
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=618b2eda98c3f41e1aa934e050e5e8f6b377d5fb;p=oota-llvm.git

[WinEH] Fix tests broken by funclet-layout

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@247944 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/test/CodeGen/X86/win-catchpad-csrs.ll b/test/CodeGen/X86/win-catchpad-csrs.ll
index 97d86603ee6..c64dcfe058d 100644
--- a/test/CodeGen/X86/win-catchpad-csrs.ll
+++ b/test/CodeGen/X86/win-catchpad-csrs.ll
@@ -66,6 +66,11 @@ catchendblock:                                    ; preds = %catch,
 ; 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:                                    ; preds = %catch,
 ; 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
diff --git a/test/CodeGen/X86/win-catchpad.ll b/test/CodeGen/X86/win-catchpad.ll
index c63907a470a..f9a5c7ca2f2 100644
--- a/test/CodeGen/X86/win-catchpad.ll
+++ b/test/CodeGen/X86/win-catchpad.ll
@@ -73,6 +73,11 @@ catchendblock:                                    ; preds = %catch, %catch.2, %c
 ; 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:                                    ; preds = %catch, %catch.2, %c
 ; 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:                                    ; preds = %catch, %catch.2, %c
 ; 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