summaryrefslogtreecommitdiffstats
path: root/llvm/test
diff options
context:
space:
mode:
Diffstat (limited to 'llvm/test')
-rw-r--r--llvm/test/CodeGen/WinEH/wineh-statenumbering.ll4
-rw-r--r--llvm/test/CodeGen/X86/win-catchpad-csrs.ll6
-rw-r--r--llvm/test/CodeGen/X86/win-catchpad.ll41
-rw-r--r--llvm/test/Transforms/SimplifyCFG/empty-cleanuppad.ll14
4 files changed, 31 insertions, 34 deletions
diff --git a/llvm/test/CodeGen/WinEH/wineh-statenumbering.ll b/llvm/test/CodeGen/WinEH/wineh-statenumbering.ll
index b54843635ab..2d5f7ca0c0e 100644
--- a/llvm/test/CodeGen/WinEH/wineh-statenumbering.ll
+++ b/llvm/test/CodeGen/WinEH/wineh-statenumbering.ll
@@ -37,7 +37,7 @@ entry:
to label %unreachable.for.entry unwind label %catch.dispatch
catch.dispatch: ; preds = %entry
- %1 = catchpad [i8* null, i8* null] to label %catch unwind label %catchendblock
+ %1 = catchpad [i8* null, i32 u0x40, i8* null] to label %catch unwind label %catchendblock
catch: ; preds = %catch.dispatch
; CHECK: catch:
@@ -47,7 +47,7 @@ catch: ; preds = %catch.dispatch
to label %unreachable unwind label %catch.dispatch.1
catch.dispatch.1: ; preds = %catch
- %2 = catchpad [i8* null, i8* null] to label %catch.3 unwind label %catchendblock.2
+ %2 = catchpad [i8* null, i32 u0x40, i8* null] to label %catch.3 unwind label %catchendblock.2
catch.3: ; preds = %catch.dispatch.1
; CHECK: catch.3:
diff --git a/llvm/test/CodeGen/X86/win-catchpad-csrs.ll b/llvm/test/CodeGen/X86/win-catchpad-csrs.ll
index c4cc945fe7d..20968cc4739 100644
--- a/llvm/test/CodeGen/X86/win-catchpad-csrs.ll
+++ b/llvm/test/CodeGen/X86/win-catchpad-csrs.ll
@@ -5,16 +5,12 @@
%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 i32 @getint()
declare void @useints(...)
declare void @f(i32 %p)
@@ -31,7 +27,7 @@ entry:
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, i8* null]
to label %catch unwind label %catchendblock
catch:
diff --git a/llvm/test/CodeGen/X86/win-catchpad.ll b/llvm/test/CodeGen/X86/win-catchpad.ll
index a6600fb1f8a..690e8ba3ea8 100644
--- a/llvm/test/CodeGen/X86/win-catchpad.ll
+++ b/llvm/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
diff --git a/llvm/test/Transforms/SimplifyCFG/empty-cleanuppad.ll b/llvm/test/Transforms/SimplifyCFG/empty-cleanuppad.ll
index def86e162c3..d04c567e503 100644
--- a/llvm/test/Transforms/SimplifyCFG/empty-cleanuppad.ll
+++ b/llvm/test/Transforms/SimplifyCFG/empty-cleanuppad.ll
@@ -86,7 +86,7 @@ ehcleanup: ; preds = %entry
cleanupret %0 unwind label %catch.dispatch
catch.dispatch: ; preds = %ehcleanup
- %1 = catchpad [i8* null, i8* null] to label %catch unwind label %catchendblock
+ %1 = catchpad [i8* null, i32 u0x40, i8* null] to label %catch unwind label %catchendblock
catch: ; preds = %catch.dispatch
catchret %1 to label %catchret.dest
@@ -126,7 +126,7 @@ ehcleanup.1: ; preds = %catchendblock
; CHECK: invoke void @g()
; CHECK: to label %try.cont unwind label %catch.dispatch
; CHECK: catch.dispatch:
-; CHECK: catchpad [i8* null, i8* null]
+; CHECK: catchpad [i8* null, i32 64, i8* null]
; CHECK-NEXT: to label %catch unwind label %catchendblock
; CHECK: catch:
; CHECK: catchret
@@ -151,7 +151,7 @@ ehcleanup: ; preds = %entry
cleanupret %0 unwind label %catch.dispatch
catch.dispatch: ; preds = %ehcleanup
- %1 = catchpad [i8* null, i8* null] to label %catch unwind label %catchendblock
+ %1 = catchpad [i8* null, i32 u0x40, i8* null] to label %catch unwind label %catchendblock
catch: ; preds = %catch.dispatch
catchret %1 to label %catchret.dest
@@ -214,7 +214,7 @@ invoke.cont: ; preds = %entry
to label %try.cont unwind label %catch.dispatch
catch.dispatch: ; preds = %invoke.cont
- %0 = catchpad [i8* null, i8* null] to label %catch unwind label %catchendblock
+ %0 = catchpad [i8* null, i32 u0x40, i8* null] to label %catch unwind label %catchendblock
catch: ; preds = %catch.dispatch
catchret %0 to label %try.cont
@@ -329,7 +329,7 @@ ehcleanup: ; preds = %invoke.cont, %entry
cleanupret %0 unwind label %catch.dispatch
catch.dispatch: ; preds = %ehcleanup
- %1 = catchpad [i8* null, i8* null] to label %catch unwind label %catchendblock
+ %1 = catchpad [i8* null, i32 u0x40, i8* null] to label %catch unwind label %catchendblock
catch: ; preds = %catch.dispatch
catchret %1 to label %return
@@ -395,7 +395,7 @@ ehcleanup: ; preds = %invoke.cont.1, %inv
catch.dispatch: ; preds = %ehcleanup, %entry
%state.1 = phi i32 [ %state.0, %ehcleanup ], [ 1, %entry ]
- %1 = catchpad [i8* null, i8* null] to label %catch unwind label %catchendblock
+ %1 = catchpad [i8* null, i32 u0x40, i8* null] to label %catch unwind label %catchendblock
catch: ; preds = %catch.dispatch
catchret %1 to label %return
@@ -460,7 +460,7 @@ ehcleanup: ; preds = %invoke.cont, %entry
cleanupret %0 unwind label %catch.dispatch
catch.dispatch: ; preds = %ehcleanup, %catch.cont
- %1 = catchpad [i8* null, i8* null] to label %catch unwind label %catchendblock
+ %1 = catchpad [i8* null, i32 u0x40, i8* null] to label %catch unwind label %catchendblock
catch: ; preds = %catch.dispatch
call void @use_x(i32 %x)
OpenPOWER on IntegriCloud