[WinEH] Pull Adjectives and CatchObj out of the catchpad arg list

[oota-llvm.git] / test / CodeGen / X86 / win-catchpad.ll

diff --git a/test/CodeGen/X86/win-catchpad.ll b/test/CodeGen/X86/win-catchpad.ll
index a6600fb1f8ab66ad7a3fe38e377cddf281bc7589..690e8ba3ea8a821d00ff38c716f07b55e2423ca2 100644 (file)
--- a/test/CodeGen/X86/win-catchpad.ll
+++ b/test/CodeGen/X86/win-catchpad.ll
@@ -6,8 +6,8 @@
 ;   int main() {
 ;     try {
 ;       f(1);
-;     } catch (int) {
-;       f(2);
+;     } catch (int e) {
+;       f(e);
 ;     } catch (...) {
 ;       f(3);
 ;     }
@@ -17,38 +17,37 @@
 %eh.CatchableType = type { i32, i8*, i32, i32, i32, i32, i8* }
 %eh.CatchableTypeArray.1 = type { i32, [1 x %eh.CatchableType*] }
 %eh.ThrowInfo = type { i32, i8*, i8*, i8* }
-%eh.CatchHandlerType = type { i32, i8* }
 
 $"\01??_R0H@8" = comdat any
 
 @"\01??_7type_info@@6B@" = external constant i8*
 @"\01??_R0H@8" = linkonce_odr global %rtti.TypeDescriptor2 { i8** @"\01??_7type_info@@6B@", i8* null, [3 x i8] c".H\00" }, comdat
 
-@llvm.eh.handlertype.H.0 = private unnamed_addr constant %eh.CatchHandlerType { i32 0, i8* bitcast (%rtti.TypeDescriptor2* @"\01??_R0H@8" to i8*) }, section "llvm.metadata"
-@llvm.eh.handlertype.H.1 = private unnamed_addr constant %eh.CatchHandlerType { i32 1, i8* bitcast (%rtti.TypeDescriptor2* @"\01??_R0H@8" to i8*) }, section "llvm.metadata"
 
 declare void @f(i32 %p, i32* %l)
 declare i32 @__CxxFrameHandler3(...)
 
 define i32 @try_catch_catch() personality i8* bitcast (i32 (...)* @__CxxFrameHandler3 to i8*) {
 entry:
+  %e.addr = alloca i32
   %local = alloca i32
   invoke void @f(i32 1, i32* %local)
           to label %try.cont unwind label %catch.dispatch
 
 catch.dispatch:                                   ; preds = %entry
-  %0 = catchpad [%eh.CatchHandlerType* @llvm.eh.handlertype.H.0, i8* null]
+  %0 = catchpad [%rtti.TypeDescriptor2* @"\01??_R0H@8", i32 0, i32* %e.addr]
           to label %catch unwind label %catch.dispatch.2
 
 catch:                                            ; preds = %catch.dispatch
-  invoke void @f(i32 2, i32* %local)
+  %e = load i32, i32* %e.addr
+  invoke void @f(i32 %e, i32* %local)
           to label %invoke.cont.2 unwind label %catchendblock
 
 invoke.cont.2:                                    ; preds = %catch
   catchret %0 to label %try.cont
 
 catch.dispatch.2:                                   ; preds = %catch.dispatch
-  %1 = catchpad [%eh.CatchHandlerType* @llvm.eh.handlertype.H.0, i8* null]
+  %1 = catchpad [i8* null, i32 u0x40, i8* null]
           to label %catch.2 unwind label %catchendblock
 
 catch.2:                                            ; preds = %catch.dispatch.2
@@ -79,10 +78,11 @@ catchendblock:                                    ; preds = %catch, %catch.2, %c
 ; X86: pushl %ebp
 ; X86: addl $12, %ebp
 ; X86: subl $8, %esp
+; X86: movl -32(%ebp), %[[e_reg:[a-z]+]]
 ; X86: movl $1, -{{[0-9]+}}(%ebp)
 ; X86: leal -[[local_offs]](%ebp), %[[addr_reg:[a-z]+]]
 ; X86-DAG: movl %[[addr_reg]], 4(%esp)
-; X86-DAG: movl $2, (%esp)
+; X86-DAG: movl %[[e_reg]], (%esp)
 ; X86: calll _f
 ; X86: movl $[[contbb]], %eax
 ; X86-NEXT: addl $8, %esp
@@ -105,14 +105,14 @@ catchendblock:                                    ; preds = %catch, %catch.2, %c
 
 ; X86: L__ehtable$try_catch_catch:
 ; X86: $handlerMap$0$try_catch_catch:
-; X86:   .long   0
-; X86:   .long   "??_R0H@8"
-; X86:   .long   0
-; X86:   .long   [[catch1bb]]
-; X86:   .long   0
-; X86:   .long   "??_R0H@8"
-; X86:   .long   0
-; X86:   .long   [[catch2bb]]
+; X86-NEXT:   .long   0
+; X86-NEXT:   .long   "??_R0H@8"
+; X86-NEXT:   .long   -20
+; X86-NEXT:   .long   [[catch1bb]]
+; X86-NEXT:   .long   64
+; X86-NEXT:   .long   0
+; X86-NEXT:   .long   0
+; X86-NEXT:   .long   [[catch2bb]]
 
 ; X64-LABEL: try_catch_catch:
 ; X64: pushq %rbp
@@ -135,7 +135,7 @@ catchendblock:                                    ; preds = %catch, %catch.2, %c
 ; X64: movq %rdx, %rbp
 ; X64: subq $32, %rsp
 ; X64-DAG: leaq -[[local_offs]](%rbp), %rdx
-; X64-DAG: movl $2, %ecx
+; X64-DAG: movl [[e_addr:[-0-9]+]](%rbp), %ecx
 ; X64: callq f
 ; X64: leaq [[contbb]](%rip), %rax
 ; X64: addq $32, %rsp
@@ -158,11 +158,12 @@ catchendblock:                                    ; preds = %catch, %catch.2, %c
 ; X64: $handlerMap$0$try_catch_catch:
 ; X64:   .long   0
 ; X64:   .long   "??_R0H@8"@IMGREL
-; X64:   .long   0
+; FIXME: This should probably be offset from rsp, not rbp.
+; X64:   .long   [[e_addr]]
 ; X64:   .long   [[catch1bb]]@IMGREL
 ; X64:   .long   56
+; X64:   .long   64
 ; X64:   .long   0
-; X64:   .long   "??_R0H@8"@IMGREL
 ; X64:   .long   0
 ; X64:   .long   [[catch2bb]]@IMGREL
 ; X64:   .long   56