diff options
| author | David Majnemer <david.majnemer@gmail.com> | 2015-09-17 21:11:12 +0000 |
|---|---|---|
| committer | David Majnemer <david.majnemer@gmail.com> | 2015-09-17 21:11:12 +0000 |
| commit | 163b7f121c402390b64cac824306d91457a65e32 (patch) | |
| tree | 753341b8744591434d813dd5b65c2bc9f9da179e /llvm | |
| parent | 70eff2571fec8df3701ba1955cab2068643c2375 (diff) | |
| download | bcm5719-llvm-163b7f121c402390b64cac824306d91457a65e32.tar.gz bcm5719-llvm-163b7f121c402390b64cac824306d91457a65e32.zip | |
[WinEH] Fix tests broken by funclet-layout
llvm-svn: 247944
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/test/CodeGen/X86/win-catchpad-csrs.ll | 13 | ||||
| -rw-r--r-- | llvm/test/CodeGen/X86/win-catchpad.ll | 13 |
2 files changed, 12 insertions, 14 deletions
diff --git a/llvm/test/CodeGen/X86/win-catchpad-csrs.ll b/llvm/test/CodeGen/X86/win-catchpad-csrs.ll index 97d86603ee6..c64dcfe058d 100644 --- a/llvm/test/CodeGen/X86/win-catchpad-csrs.ll +++ b/llvm/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/llvm/test/CodeGen/X86/win-catchpad.ll b/llvm/test/CodeGen/X86/win-catchpad.ll index c63907a470a..f9a5c7ca2f2 100644 --- a/llvm/test/CodeGen/X86/win-catchpad.ll +++ b/llvm/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 |
