Author: Nikita Popov Date: 2022-12-12T14:49:32+01:00 New Revision: 5f843693a461696a00f2e349b51e4cc9282a1a7b
URL: https://github.com/llvm/llvm-project/commit/5f843693a461696a00f2e349b51e4cc9282a1a7b DIFF: https://github.com/llvm/llvm-project/commit/5f843693a461696a00f2e349b51e4cc9282a1a7b.diff LOG: [Clang] Convert CXX tests to opaque pointers (NFC) Added: Modified: clang/test/CXX/drs/dr158.cpp clang/test/CXX/except/except.spec/p14-ir.cpp clang/test/CXX/except/except.spec/p9-dynamic.cpp clang/test/CXX/except/except.spec/p9-noexcept.cpp clang/test/CXX/expr/expr.prim/expr.prim.lambda/blocks-irgen.mm clang/test/CXX/expr/p10-0x.cpp clang/test/CXX/special/class.copy/p15-inclass.cpp Removed: ################################################################################ diff --git a/clang/test/CXX/drs/dr158.cpp b/clang/test/CXX/drs/dr158.cpp index 40603d4a4a05c..a0a8bd05baee3 100644 --- a/clang/test/CXX/drs/dr158.cpp +++ b/clang/test/CXX/drs/dr158.cpp @@ -1,15 +1,15 @@ -// RUN: %clang_cc1 -no-opaque-pointers -triple x86_64-linux -std=c++98 %s -O3 -disable-llvm-passes -pedantic-errors -emit-llvm -o - | FileCheck %s -// RUN: %clang_cc1 -no-opaque-pointers -triple x86_64-linux -std=c++11 %s -O3 -disable-llvm-passes -pedantic-errors -emit-llvm -o - | FileCheck %s -// RUN: %clang_cc1 -no-opaque-pointers -triple x86_64-linux -std=c++14 %s -O3 -disable-llvm-passes -pedantic-errors -emit-llvm -o - | FileCheck %s -// RUN: %clang_cc1 -no-opaque-pointers -triple x86_64-linux -std=c++1z %s -O3 -disable-llvm-passes -pedantic-errors -emit-llvm -o - | FileCheck %s +// RUN: %clang_cc1 -triple x86_64-linux -std=c++98 %s -O3 -disable-llvm-passes -pedantic-errors -emit-llvm -o - | FileCheck %s +// RUN: %clang_cc1 -triple x86_64-linux -std=c++11 %s -O3 -disable-llvm-passes -pedantic-errors -emit-llvm -o - | FileCheck %s +// RUN: %clang_cc1 -triple x86_64-linux -std=c++14 %s -O3 -disable-llvm-passes -pedantic-errors -emit-llvm -o - | FileCheck %s +// RUN: %clang_cc1 -triple x86_64-linux -std=c++1z %s -O3 -disable-llvm-passes -pedantic-errors -emit-llvm -o - | FileCheck %s // dr158: yes // CHECK-LABEL: define {{.*}} @_Z1f const int *f(const int * const *p, int **q) { - // CHECK: load i32**, {{.*}}, !tbaa ![[INTPTR_TBAA:[^,]*]] + // CHECK: load ptr, {{.*}}, !tbaa ![[INTPTR_TBAA:[^,]*]] const int *x = *p; - // CHECK: store i32* null, {{.*}}, !tbaa ![[INTPTR_TBAA]] + // CHECK: store ptr null, {{.*}}, !tbaa ![[INTPTR_TBAA]] *q = 0; return x; } @@ -18,9 +18,9 @@ struct A {}; // CHECK-LABEL: define {{.*}} @_Z1g const int *(A::*const *g(const int *(A::* const **p)[3], int *(A::***q)[3]))[3] { - // CHECK: load i64**, {{.*}}, !tbaa ![[MEMPTR_TBAA:[^,]*]] + // CHECK: load ptr, {{.*}}, !tbaa ![[MEMPTR_TBAA:[^,]*]] const int *(A::*const *x)[3] = *p; - // CHECK: store i64* null, {{.*}}, !tbaa ![[MEMPTR_TBAA]] + // CHECK: store ptr null, {{.*}}, !tbaa ![[MEMPTR_TBAA]] *q = 0; return x; } diff --git a/clang/test/CXX/except/except.spec/p14-ir.cpp b/clang/test/CXX/except/except.spec/p14-ir.cpp index 1406cd34ac4ce..48d0669ec641e 100644 --- a/clang/test/CXX/except/except.spec/p14-ir.cpp +++ b/clang/test/CXX/except/except.spec/p14-ir.cpp @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -no-opaque-pointers -triple x86_64-apple-darwin10 -emit-llvm -fexceptions -o - %s | FileCheck %s +// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -emit-llvm -fexceptions -o - %s | FileCheck %s // Copy constructor struct X0 { @@ -26,12 +26,12 @@ struct X4 { struct X5 : X0, X4 { }; void test(X2 x2, X3 x3, X5 x5) { - // CHECK: define linkonce_odr void @_ZN2X2C1ERKS_(%struct.X2* {{[^,]*}} %this, %struct.X2* noundef nonnull align {{[0-9]+}} dereferenceable({{[0-9]+}}) %0) unnamed_addr + // CHECK: define linkonce_odr void @_ZN2X2C1ERKS_(ptr {{[^,]*}} %this, ptr noundef nonnull align {{[0-9]+}} dereferenceable({{[0-9]+}}) %0) unnamed_addr // CHECK: call void @_ZN2X2C2ERKS_({{.*}}) [[NUW:#[0-9]+]] // CHECK-NEXT: ret void // CHECK-NEXT: } X2 x2a(x2); - // CHECK: define linkonce_odr void @_ZN2X3C1ERKS_(%struct.X3* {{[^,]*}} %this, %struct.X3* noundef nonnull align {{[0-9]+}} dereferenceable({{[0-9]+}}) %0) unnamed_addr + // CHECK: define linkonce_odr void @_ZN2X3C1ERKS_(ptr {{[^,]*}} %this, ptr noundef nonnull align {{[0-9]+}} dereferenceable({{[0-9]+}}) %0) unnamed_addr // CHECK: call void @_ZN2X3C2ERKS_({{.*}}) [[NUW]] // CHECK-NEXT: ret void // CHECK-NEXT: } @@ -55,25 +55,24 @@ struct X8 : X6 { }; struct X9 : X6, X7 { }; void test() { - // CHECK: define linkonce_odr void @_ZN2X8C1Ev(%struct.X8* {{[^,]*}} %this) unnamed_addr + // CHECK: define linkonce_odr void @_ZN2X8C1Ev(ptr {{[^,]*}} %this) unnamed_addr // CHECK: call void @_ZN2X8C2Ev({{.*}}) [[NUW]] // CHECK-NEXT: ret void X8(); - // CHECK: define linkonce_odr void @_ZN2X9C1Ev(%struct.X9* {{[^,]*}} %this) unnamed_addr + // CHECK: define linkonce_odr void @_ZN2X9C1Ev(ptr {{[^,]*}} %this) unnamed_addr // FIXME: check that this is the end of the line here: // CHECK: call void @_ZN2X9C2Ev({{.*}}) // CHECK-NEXT: ret void X9(); - // CHECK: define linkonce_odr void @_ZN2X8C2Ev(%struct.X8* {{[^,]*}} %this) unnamed_addr + // CHECK: define linkonce_odr void @_ZN2X8C2Ev(ptr {{[^,]*}} %this) unnamed_addr // CHECK: call void @_ZN2X6C2Ev({{.*}}) [[NUW]] // CHECK-NEXT: ret void - // CHECK: define linkonce_odr void @_ZN2X9C2Ev(%struct.X9* {{[^,]*}} %this) unnamed_addr + // CHECK: define linkonce_odr void @_ZN2X9C2Ev(ptr {{[^,]*}} %this) unnamed_addr // CHECK: call void @_ZN2X6C2Ev({{.*}}) [[NUW]] // FIXME: and here: - // CHECK-NEXT: bitcast // CHECK-NEXT: call void @_ZN2X7C2Ev({{.*}}) // CHECK: ret void } diff --git a/clang/test/CXX/except/except.spec/p9-dynamic.cpp b/clang/test/CXX/except/except.spec/p9-dynamic.cpp index 70cd630840a33..a9d22a79dd2db 100644 --- a/clang/test/CXX/except/except.spec/p9-dynamic.cpp +++ b/clang/test/CXX/except/except.spec/p9-dynamic.cpp @@ -1,12 +1,12 @@ -// RUN: %clang_cc1 %std_cxx98-14 -no-opaque-pointers %s -triple=x86_64-apple-darwin10 -emit-llvm -o - -fcxx-exceptions -fexceptions | FileCheck %s --check-prefixes=CHECK,CHECK-PRE17 -// RUN: %clang_cc1 %std_cxx17- -no-opaque-pointers %s -triple=x86_64-apple-darwin10 -Wno-dynamic-exception-spec -emit-llvm -o - -fcxx-exceptions -fexceptions | FileCheck %s --check-prefixes=CHECK,CHECK-17 +// RUN: %clang_cc1 %std_cxx98-14 %s -triple=x86_64-apple-darwin10 -emit-llvm -o - -fcxx-exceptions -fexceptions | FileCheck %s --check-prefixes=CHECK,CHECK-PRE17 +// RUN: %clang_cc1 %std_cxx17- %s -triple=x86_64-apple-darwin10 -Wno-dynamic-exception-spec -emit-llvm -o - -fcxx-exceptions -fexceptions | FileCheck %s --check-prefixes=CHECK,CHECK-17 void external(); // CHECK-LABEL: _Z6targetv( // CHECK: invoke void @_Z8externalv() -// CHECK: landingpad { i8*, i32 } -// CHECK-NEXT: filter [1 x i8*] [i8* bitcast (i8** @_ZTIi to i8*)] +// CHECK: landingpad { ptr, i32 } +// CHECK-NEXT: filter [1 x ptr] [ptr @_ZTIi] // CHECK: call void @__cxa_call_unexpected void target() throw(int) { @@ -15,9 +15,9 @@ void target() throw(int) // CHECK-LABEL: _Z7target2v( // CHECK: invoke void @_Z8externalv() -// CHECK: landingpad { i8*, i32 } -// CHECK-PRE17-NEXT: filter [0 x i8*] zeroinitializer -// CHECK-17-NEXT: catch i8* null +// CHECK: landingpad { ptr, i32 } +// CHECK-PRE17-NEXT: filter [0 x ptr] zeroinitializer +// CHECK-17-NEXT: catch ptr null // CHECK-PRE17: call void @__cxa_call_unexpected // CHECK-17: call void @__clang_call_terminate void target2() throw() diff --git a/clang/test/CXX/except/except.spec/p9-noexcept.cpp b/clang/test/CXX/except/except.spec/p9-noexcept.cpp index 501248d9f78cc..74161a50bd3a4 100644 --- a/clang/test/CXX/except/except.spec/p9-noexcept.cpp +++ b/clang/test/CXX/except/except.spec/p9-noexcept.cpp @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -no-opaque-pointers %s -std=c++11 -triple=x86_64-apple-darwin10 -emit-llvm -o - -fcxx-exceptions -fexceptions | FileCheck %s +// RUN: %clang_cc1 %s -std=c++11 -triple=x86_64-apple-darwin10 -emit-llvm -o - -fcxx-exceptions -fexceptions | FileCheck %s void external(); @@ -7,10 +7,10 @@ void target() noexcept // CHECK: invoke void @_Z8externalv() external(); } -// CHECK: [[T0:%.*]] = landingpad { i8*, i32 } -// CHECK-NEXT: catch i8* null -// CHECK-NEXT: [[T1:%.*]] = extractvalue { i8*, i32 } [[T0]], 0 -// CHECK-NEXT: call void @__clang_call_terminate(i8* [[T1]]) [[NR_NUW:#[0-9]+]] +// CHECK: [[T0:%.*]] = landingpad { ptr, i32 } +// CHECK-NEXT: catch ptr null +// CHECK-NEXT: [[T1:%.*]] = extractvalue { ptr, i32 } [[T0]], 0 +// CHECK-NEXT: call void @__clang_call_terminate(ptr [[T1]]) [[NR_NUW:#[0-9]+]] // CHECK-NEXT: unreachable void reverse() noexcept(false) diff --git a/clang/test/CXX/expr/expr.prim/expr.prim.lambda/blocks-irgen.mm b/clang/test/CXX/expr/expr.prim/expr.prim.lambda/blocks-irgen.mm index d50395d9ec227..8e4cd72e33480 100644 --- a/clang/test/CXX/expr/expr.prim/expr.prim.lambda/blocks-irgen.mm +++ b/clang/test/CXX/expr/expr.prim/expr.prim.lambda/blocks-irgen.mm @@ -1,9 +1,9 @@ -// RUN: %clang_cc1 -no-opaque-pointers -std=c++11 -fblocks -emit-llvm -o - -triple x86_64-apple-darwin11.3 %s | FileCheck %s +// RUN: %clang_cc1 -std=c++11 -fblocks -emit-llvm -o - -triple x86_64-apple-darwin11.3 %s | FileCheck %s namespace PR12746 { // CHECK: define{{.*}} zeroext i1 @_ZN7PR127462f1EPi bool f1(int *x) { - // CHECK: store i8* bitcast (i1 (i8*)* @___ZN7PR127462f1EPi_block_invoke to i8*) + // CHECK: store ptr @___ZN7PR127462f1EPi_block_invoke bool (^outer)() = ^ { auto inner = [&]() -> bool { return x == 0; diff --git a/clang/test/CXX/expr/p10-0x.cpp b/clang/test/CXX/expr/p10-0x.cpp index 7e6fbb7e56ad6..02ba0d83b005f 100644 --- a/clang/test/CXX/expr/p10-0x.cpp +++ b/clang/test/CXX/expr/p10-0x.cpp @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -no-opaque-pointers -emit-llvm -triple x86_64-pc-linux-gnu %s -o - -std=c++11 | FileCheck %s +// RUN: %clang_cc1 -emit-llvm -triple x86_64-pc-linux-gnu %s -o - -std=c++11 | FileCheck %s volatile int g1; struct S { @@ -10,26 +10,26 @@ volatile int& refcall(); // CHECK: define{{.*}} void @_Z2f1PViPV1S void f1(volatile int *x, volatile S* s) { // We should perform the load in these cases. - // CHECK: load volatile i32, i32* + // CHECK: load volatile i32, ptr (*x); - // CHECK: load volatile i32, i32* + // CHECK: load volatile i32, ptr __extension__ g1; - // CHECK: load volatile i32, i32* + // CHECK: load volatile i32, ptr s->a; - // CHECK: load volatile i32, i32* + // CHECK: load volatile i32, ptr g2.a; - // CHECK: load volatile i32, i32* + // CHECK: load volatile i32, ptr s->*(&S::a); - // CHECK: load volatile i32, i32* - // CHECK: load volatile i32, i32* + // CHECK: load volatile i32, ptr + // CHECK: load volatile i32, ptr x[0], 1 ? x[0] : *x; - // CHECK: load volatile i32, i32* - // CHECK: load volatile i32, i32* - // CHECK: load volatile i32, i32* + // CHECK: load volatile i32, ptr + // CHECK: load volatile i32, ptr + // CHECK: load volatile i32, ptr *x ?: *x; - // CHECK: load volatile i32, i32* + // CHECK: load volatile i32, ptr ({ *x; }); // CHECK-NOT: load volatile diff --git a/clang/test/CXX/special/class.copy/p15-inclass.cpp b/clang/test/CXX/special/class.copy/p15-inclass.cpp index e099170949332..ecb4a4afffdb2 100644 --- a/clang/test/CXX/special/class.copy/p15-inclass.cpp +++ b/clang/test/CXX/special/class.copy/p15-inclass.cpp @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -no-opaque-pointers -triple x86_64-apple-darwin -std=c++11 -emit-llvm -o - %s | FileCheck %s +// RUN: %clang_cc1 -triple x86_64-apple-darwin -std=c++11 -emit-llvm -o - %s | FileCheck %s namespace PR11418 { struct NonPOD { @@ -24,7 +24,7 @@ namespace PR11418 { // CHECK-NOT: 17 // CHECK: call void @_ZN7PR114186NonPODC1ERKS0_ // CHECK-NOT: 17 - // CHECK: load i32, i32* + // CHECK: load i32, ptr // CHECK-NOT: 17 // CHECK: store i32 // CHECK-NOT: 17 @@ -34,7 +34,7 @@ namespace PR11418 { // CHECK-NOT: 17 // CHECK: call void @_ZN7PR114186NonPODC1EOS0_ // CHECK-NOT: 17 - // CHECK: load i32, i32* + // CHECK: load i32, ptr // CHECK-NOT: 17 // CHECK: store i32 // CHECK-NOT: 17 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits