From 45b533945f0851ec234ca846e1af5ee1e4df0b6e Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Wed, 30 Dec 2015 11:49:41 +0000 Subject: Vendor import of clang trunk r256633: https://llvm.org/svn/llvm-project/cfe/trunk@256633 --- test/CodeGenCXX/microsoft-abi-thread-safe-statics.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'test/CodeGenCXX/microsoft-abi-thread-safe-statics.cpp') diff --git a/test/CodeGenCXX/microsoft-abi-thread-safe-statics.cpp b/test/CodeGenCXX/microsoft-abi-thread-safe-statics.cpp index 89a62c2cb390..29b434eaf2c5 100644 --- a/test/CodeGenCXX/microsoft-abi-thread-safe-statics.cpp +++ b/test/CodeGenCXX/microsoft-abi-thread-safe-statics.cpp @@ -39,15 +39,11 @@ extern inline S &f() { // CHECK-NEXT: ret %struct.S* @"\01?s@?1??f@@YAAAUS@@XZ@4U2@A" // CHECK: [[lpad:.*]]: -// CHECK-NEXT: landingpad { i8*, i32 } -// CHECK-NEXT: cleanup +// CHECK-NEXT: cleanuppad within none [] // CHECK: %[[guard:.*]] = load i32, i32* @"\01??__J?1??f@@YAAAUS@@XZ@51" // CHECK-NEXT: %[[mask:.*]] = and i32 %[[guard]], -2 // CHECK-NEXT: store i32 %[[mask]], i32* @"\01??__J?1??f@@YAAAUS@@XZ@51" -// CHECK-NEXT: br label %[[eh_resume:.*]] -// -// CHECK: [[eh_resume]]: -// CHECK: resume { i8*, i32 } +// CHECK-NEXT: cleanupret {{.*}} unwind to caller return s; } @@ -79,11 +75,9 @@ extern inline S &g() { // CHECK-NEXT: ret %struct.S* @"\01?s@?1??g@@YAAAUS@@XZ@4U2@A" // // CHECK: [[lpad]]: +// CHECK-NEXT: cleanuppad within none [] // CHECK: call void @_Init_thread_abort(i32* @"\01?$TSS0@?1??g@@YAAAUS@@XZ") -// CHECK-NEXT: br label %[[eh_resume:.*]] -// -// CHECK: [[eh_resume]]: -// CHECK: resume { i8*, i32 } +// CHECK-NEXT: cleanupret {{.*}} unwind to caller return s; } -- cgit v1.3