Author: niravd Date: Tue Apr 5 13:59:37 2016 New Revision: 265439 URL: http://llvm.org/viewvc/llvm-project?rev=265439&view=rev Log: Fix broken tests from no-jump-table commit
Summary: Fix failing tests from no-jump-table flag addition Reviewers: jyknight Subscribers: llvm-commits Differential Revision: http://reviews.llvm.org/D18801 Modified: cfe/trunk/test/CodeGen/cfi-check-fail.c cfe/trunk/test/CodeGen/cfi-check-fail2.c cfe/trunk/test/CodeGenCXX/2009-05-04-PureConstNounwind.cpp cfe/trunk/test/CodeGenCXX/cxx11-exception-spec.cpp cfe/trunk/test/CodeGenCXX/dllexport.cpp cfe/trunk/test/CodeGenObjCXX/personality-abuse.mm Modified: cfe/trunk/test/CodeGen/cfi-check-fail.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/cfi-check-fail.c?rev=265439&r1=265438&r2=265439&view=diff ============================================================================== --- cfe/trunk/test/CodeGen/cfi-check-fail.c (original) +++ cfe/trunk/test/CodeGen/cfi-check-fail.c Tue Apr 5 13:59:37 2016 @@ -7,7 +7,7 @@ void caller(void (*f)()) { f(); } -// CHECK: define weak_odr hidden void @__cfi_check_fail(i8*, i8*) { +// CHECK: define weak_odr hidden void @__cfi_check_fail(i8*, i8*) // CHECK: store i8* %0, i8** %[[ALLOCA0:.*]], align 8 // CHECK: store i8* %1, i8** %[[ALLOCA1:.*]], align 8 // CHECK: %[[DATA:.*]] = load i8*, i8** %[[ALLOCA0]], align 8 Modified: cfe/trunk/test/CodeGen/cfi-check-fail2.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/cfi-check-fail2.c?rev=265439&r1=265438&r2=265439&view=diff ============================================================================== --- cfe/trunk/test/CodeGen/cfi-check-fail2.c (original) +++ cfe/trunk/test/CodeGen/cfi-check-fail2.c Tue Apr 5 13:59:37 2016 @@ -7,7 +7,7 @@ void caller(void (*f)()) { f(); } -// CHECK: define weak_odr hidden void @__cfi_check_fail(i8*, i8*) { +// CHECK: define weak_odr hidden void @__cfi_check_fail(i8*, i8*) // CHECK: store i8* %0, i8** %[[ALLOCA0:.*]], align 8 // CHECK: store i8* %1, i8** %[[ALLOCA1:.*]], align 8 // CHECK: %[[DATA:.*]] = load i8*, i8** %[[ALLOCA0]], align 8 Modified: cfe/trunk/test/CodeGenCXX/2009-05-04-PureConstNounwind.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/2009-05-04-PureConstNounwind.cpp?rev=265439&r1=265438&r2=265439&view=diff ============================================================================== --- cfe/trunk/test/CodeGenCXX/2009-05-04-PureConstNounwind.cpp (original) +++ cfe/trunk/test/CodeGenCXX/2009-05-04-PureConstNounwind.cpp Tue Apr 5 13:59:37 2016 @@ -12,10 +12,11 @@ int f(void) { // CHECK: declare i32 @_Z1cv() [[NUW_RN:#[0-9]+]] // CHECK: declare i32 @_Z1pv() [[NUW_RO:#[0-9]+]] -// CHECK: declare i32 @_Z1tv() [[TF]] +// CHECK: declare i32 @_Z1tv() [[TF2:#[0-9]+]] // CHECK: attributes [[TF]] = { {{.*}} } // CHECK: attributes [[NUW_RN]] = { nounwind readnone{{.*}} } // CHECK: attributes [[NUW_RO]] = { nounwind readonly{{.*}} } +// CHECK: attributes [[TF2]] = { {{.*}} } // CHECK: attributes [[NUW_RN_CALL]] = { nounwind readnone } // CHECK: attributes [[NUW_RO_CALL]] = { nounwind readonly } Modified: cfe/trunk/test/CodeGenCXX/cxx11-exception-spec.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/cxx11-exception-spec.cpp?rev=265439&r1=265438&r2=265439&view=diff ============================================================================== --- cfe/trunk/test/CodeGenCXX/cxx11-exception-spec.cpp (original) +++ cfe/trunk/test/CodeGenCXX/cxx11-exception-spec.cpp Tue Apr 5 13:59:37 2016 @@ -70,37 +70,37 @@ void h() { // CHECK: define {{.*}} @_Z1iv void i() { - // CHECK: declare {{.*}} @_Z1gIiEvv() [[NUW]] + // CHECK: declare {{.*}} @_Z1gIiEvv() [[NUW2:#[0-9]+]] g<int>(); // CHECK: declare {{.*}} @_Z1gIA2_iEvv() // CHECK-NOT: [[NUW]] g<int[2]>(); - // CHECK: declare {{.*}} @_ZN1SIiE1gEv() [[NUW]] + // CHECK: declare {{.*}} @_ZN1SIiE1gEv() [[NUW2]] S<int>::g(); // CHECK: declare {{.*}} @_ZN1SIA2_iE1gEv() // CHECK-NOT: [[NUW]] S<int[2]>::g(); - // CHECK: declare {{.*}} @_Z1gIfEvv() [[NUW]] + // CHECK: declare {{.*}} @_Z1gIfEvv() [[NUW2]] void (*g1)() = &g<float>; // CHECK: declare {{.*}} @_Z1gIdEvv() // CHECK-NOT: [[NUW]] void (*g2)() = &g<double>; - // CHECK: declare {{.*}} @_ZN1SIfE1gEv() [[NUW]] + // CHECK: declare {{.*}} @_ZN1SIfE1gEv() [[NUW2]] void (*g3)() = &S<float>::g; // CHECK: declare {{.*}} @_ZN1SIdE1gEv() // CHECK-NOT: [[NUW]] void (*g4)() = &S<double>::g; - // CHECK: declare {{.*}} @_Z1gIA4_cEvv() [[NUW]] + // CHECK: declare {{.*}} @_Z1gIA4_cEvv() [[NUW2]] (void)&g<char[4]>; // CHECK: declare {{.*}} @_Z1gIcEvv() // CHECK-NOT: [[NUW]] (void)&g<char>; - // CHECK: declare {{.*}} @_ZN1SIA4_cE1gEv() [[NUW]] + // CHECK: declare {{.*}} @_ZN1SIA4_cE1gEv() [[NUW2]] (void)&S<char[4]>::g; // CHECK: declare {{.*}} @_ZN1SIcE1gEv() // CHECK-NOT: [[NUW]] @@ -116,12 +116,15 @@ void j() { // CHECK: declare {{.*}} @_ZN6NestedIiE1fILb1EcEEvv( // CHECK-NOT: [[NUW]] Nested<int>().f<true, char>(); - // CHECK: declare {{.*}} @_ZN6NestedIlE1fILb0ElEEvv({{.*}}) [[NUW]] + // CHECK: declare {{.*}} @_ZN6NestedIlE1fILb0ElEEvv({{.*}}) [[NUW2]] Nested<long>().f<false, long>(); } // CHECK: attributes [[NONE]] = { {{.*}} } // CHECK: attributes [[NUW]] = { nounwind{{.*}} } +// CHECK: attributes [[NUW2]] = { nounwind{{.*}} } + + namespace PR19190 { template <class T> struct DWFIterator { virtual void get() throw(int) = 0; }; Modified: cfe/trunk/test/CodeGenCXX/dllexport.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/dllexport.cpp?rev=265439&r1=265438&r2=265439&view=diff ============================================================================== --- cfe/trunk/test/CodeGenCXX/dllexport.cpp (original) +++ cfe/trunk/test/CodeGenCXX/dllexport.cpp Tue Apr 5 13:59:37 2016 @@ -486,7 +486,7 @@ struct S { struct CtorWithClosure { __declspec(dllexport) CtorWithClosure(...) {} -// M32-DAG: define weak_odr dllexport x86_thiscallcc void @"\01??_FCtorWithClosure@@QAEXXZ"({{.*}}) comdat +// M32-DAG: define weak_odr dllexport x86_thiscallcc void @"\01??_FCtorWithClosure@@QAEXXZ"({{.*}}) {{#[0-9]+}} comdat // M32-DAG: %[[this_addr:.*]] = alloca %struct.CtorWithClosure*, align 4 // M32-DAG: store %struct.CtorWithClosure* %this, %struct.CtorWithClosure** %[[this_addr]], align 4 // M32-DAG: %[[this:.*]] = load %struct.CtorWithClosure*, %struct.CtorWithClosure** %[[this_addr]] @@ -503,7 +503,7 @@ struct CtorWithClosure { struct __declspec(dllexport) ClassWithClosure { DELETE_IMPLICIT_MEMBERS(ClassWithClosure); ClassWithClosure(...) {} -// M32-DAG: define weak_odr dllexport x86_thiscallcc void @"\01??_FClassWithClosure@@QAEXXZ"({{.*}}) comdat +// M32-DAG: define weak_odr dllexport x86_thiscallcc void @"\01??_FClassWithClosure@@QAEXXZ"({{.*}}) {{#[0-9]+}} comdat // M32-DAG: %[[this_addr:.*]] = alloca %struct.ClassWithClosure*, align 4 // M32-DAG: store %struct.ClassWithClosure* %this, %struct.ClassWithClosure** %[[this_addr]], align 4 // M32-DAG: %[[this:.*]] = load %struct.ClassWithClosure*, %struct.ClassWithClosure** %[[this_addr]] @@ -520,8 +520,8 @@ struct __declspec(dllexport) NestedOuter }; }; -// M32-DAG: define weak_odr dllexport x86_thiscallcc void @"\01??_FNestedOuter@@QAEXXZ"({{.*}}) comdat -// M32-DAG: define weak_odr dllexport x86_thiscallcc void @"\01??_FNestedInner@NestedOuter@@QAEXXZ"({{.*}}) comdat +// M32-DAG: define weak_odr dllexport x86_thiscallcc void @"\01??_FNestedOuter@@QAEXXZ"({{.*}}) {{#[0-9]+}} comdat +// M32-DAG: define weak_odr dllexport x86_thiscallcc void @"\01??_FNestedInner@NestedOuter@@QAEXXZ"({{.*}}) {{#[0-9]+}} comdat template <typename T> struct SomeTemplate { @@ -530,7 +530,7 @@ struct SomeTemplate { }; struct __declspec(dllexport) InheritFromTemplate : SomeTemplate<int> {}; -// M32-DAG: define weak_odr dllexport x86_thiscallcc void @"\01??_F?$SomeTemplate@H@@QAEXXZ"({{.*}}) comdat +// M32-DAG: define weak_odr dllexport x86_thiscallcc void @"\01??_F?$SomeTemplate@H@@QAEXXZ"({{.*}}) {{#[0-9]+}} comdat namespace PR23801 { template <typename> @@ -547,7 +547,7 @@ struct __declspec(dllexport) B { } // -// M32-DAG: define weak_odr dllexport x86_thiscallcc void @"\01??_FB@PR23801@@QAEXXZ"({{.*}}) comdat +// M32-DAG: define weak_odr dllexport x86_thiscallcc void @"\01??_FB@PR23801@@QAEXXZ"({{.*}}) {{#[0-9]+}} comdat struct __declspec(dllexport) T { // Copy assignment operator: Modified: cfe/trunk/test/CodeGenObjCXX/personality-abuse.mm URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenObjCXX/personality-abuse.mm?rev=265439&r1=265438&r2=265439&view=diff ============================================================================== --- cfe/trunk/test/CodeGenObjCXX/personality-abuse.mm (original) +++ cfe/trunk/test/CodeGenObjCXX/personality-abuse.mm Tue Apr 5 13:59:37 2016 @@ -16,4 +16,4 @@ void foo() { } } -// CHECK: define void @_Z3foov() #1 personality i8* bitcast (i32 ()* @__objc_personality_v0 to i8*) +// CHECK: define void @_Z3foov() {{#[0-9]+}} personality i8* bitcast (i32 ()* @__objc_personality_v0 to i8*) _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
