Author: Puyan Lotfi Date: 2019-11-14T02:25:22-05:00 New Revision: e782192d5e6540b0cbb957a6b738d98e24c88ee3
URL: https://github.com/llvm/llvm-project/commit/e782192d5e6540b0cbb957a6b738d98e24c88ee3 DIFF: https://github.com/llvm/llvm-project/commit/e782192d5e6540b0cbb957a6b738d98e24c88ee3.diff LOG: [clang][IFS][test][NFC] Tightening up clang-ifs tests to use -cc1 more often. Unless the test is explicitly testing a driver feature if clang interface stubs I have changed the tests to use %clang_cc1. This should make some changes I plan to make to the driver job pipeline cause fewer test changes and breakages. Added: Modified: clang/test/InterfaceStubs/class-template-partial-specialization.cpp clang/test/InterfaceStubs/class-template-specialization.cpp clang/test/InterfaceStubs/cxx-conversion.cpp clang/test/InterfaceStubs/driver-test.c clang/test/InterfaceStubs/externstatic.c clang/test/InterfaceStubs/function-template-specialization.cpp clang/test/InterfaceStubs/hidden-class-inheritance.cpp clang/test/InterfaceStubs/indirect-field-decl.cpp clang/test/InterfaceStubs/inline.c clang/test/InterfaceStubs/namespace.cpp clang/test/InterfaceStubs/non-type-template-parm-decl.cpp clang/test/InterfaceStubs/object.c clang/test/InterfaceStubs/template-constexpr.cpp clang/test/InterfaceStubs/template-namespace-function.cpp clang/test/InterfaceStubs/template-template-parm-decl.cpp clang/test/InterfaceStubs/trycatch.cpp clang/test/InterfaceStubs/usings.cpp clang/test/InterfaceStubs/var-template-specialization-decl.cpp clang/test/InterfaceStubs/virtual.cpp clang/test/InterfaceStubs/visibility.cpp clang/test/InterfaceStubs/weak.cpp clang/test/InterfaceStubs/windows.cpp Removed: ################################################################################ diff --git a/clang/test/InterfaceStubs/class-template-partial-specialization.cpp b/clang/test/InterfaceStubs/class-template-partial-specialization.cpp index 01734294abdd..4c0edaa2dd8f 100644 --- a/clang/test/InterfaceStubs/class-template-partial-specialization.cpp +++ b/clang/test/InterfaceStubs/class-template-partial-specialization.cpp @@ -1,4 +1,4 @@ -// RUN: %clang -c -o - -emit-interface-stubs %s | FileCheck %s +// RUN: %clang_cc1 -o - -emit-interface-stubs %s | FileCheck %s // CHECK: --- !experimental-ifs-v1 // CHECK-NEXT: IfsVersion: 1.0 diff --git a/clang/test/InterfaceStubs/class-template-specialization.cpp b/clang/test/InterfaceStubs/class-template-specialization.cpp index 0a68d3f1f117..34576546571d 100644 --- a/clang/test/InterfaceStubs/class-template-specialization.cpp +++ b/clang/test/InterfaceStubs/class-template-specialization.cpp @@ -1,13 +1,11 @@ // REQUIRES: x86-registered-target -// RUN: %clang -target x86_64-unknown-linux-gnu -o - -emit-interface-stubs -emit-merged-ifs \ -// RUN: -interface-stub-version=experimental-ifs-v1 %s | \ +// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -o - -emit-interface-stubs %s | \ // RUN: FileCheck -check-prefix=CHECK-TAPI %s -// RUN: %clang -target x86_64-unknown-linux-gnu -o - -emit-interface-stubs -emit-merged-ifs \ -// RUN: -interface-stub-version=experimental-ifs-v1 %s | \ +// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -o - -emit-interface-stubs %s | \ // RUN: FileCheck -check-prefix=CHECK-TAPI2 %s -// RUN: %clang -target x86_64-unknown-linux-gnu -o - -c %s | \ -// RUN: llvm-readelf -s - 2>&1 | \ + +// RUN: %clang -target x86_64-unknown-linux-gnu -c -o - %s | llvm-readelf -s - 2>&1 | \ // RUN: FileCheck -check-prefix=CHECK-SYMBOLS %s // For the following: diff --git a/clang/test/InterfaceStubs/cxx-conversion.cpp b/clang/test/InterfaceStubs/cxx-conversion.cpp index 70496ce8305e..96425a42b6fc 100644 --- a/clang/test/InterfaceStubs/cxx-conversion.cpp +++ b/clang/test/InterfaceStubs/cxx-conversion.cpp @@ -1,4 +1,4 @@ -// RUN: %clang -c -o - -emit-interface-stubs %s | FileCheck %s +// RUN: %clang_cc1 -o - -emit-interface-stubs %s | FileCheck %s // CHECK: --- !experimental-ifs-v1 // CHECK-NEXT: IfsVersion: 1.0 diff --git a/clang/test/InterfaceStubs/driver-test.c b/clang/test/InterfaceStubs/driver-test.c index d4e50295411a..512745276e5a 100644 --- a/clang/test/InterfaceStubs/driver-test.c +++ b/clang/test/InterfaceStubs/driver-test.c @@ -1,11 +1,12 @@ // REQUIRES: x86-registered-target -// RUN: %clang -target x86_64-unknown-linux-gnu -x c -o %t1.so -emit-interface-stubs %s %S/object.c %S/weak.cpp && \ -// RUN: llvm-nm %t1.so 2>&1 | FileCheck --check-prefix=CHECK-IFS %s +// RUN: %clang -target x86_64-unknown-linux-gnu -shared -x c -o %t1.so -emit-interface-stubs %s %S/object.c %S/weak.cpp +// RUN: llvm-nm %t1.so 2>&1 | FileCheck %s +// RUN: llvm-nm %t1.ifso 2>&1 | FileCheck %s -// CHECK-IFS-DAG: data -// CHECK-IFS-DAG: foo -// CHECK-IFS-DAG: strongFunc -// CHECK-IFS-DAG: weakFunc +// CHECK-DAG: data +// CHECK-DAG: foo +// CHECK-DAG: strongFunc +// CHECK-DAG: weakFunc int foo(int bar) { return 42 + 1844; } diff --git a/clang/test/InterfaceStubs/externstatic.c b/clang/test/InterfaceStubs/externstatic.c index 9a1f0ae491ff..8975fe640af2 100644 --- a/clang/test/InterfaceStubs/externstatic.c +++ b/clang/test/InterfaceStubs/externstatic.c @@ -1,16 +1,16 @@ -// RUN: %clang -fvisibility=default -c -DSTORAGE="extern" -o - -emit-interface-stubs -std=c99 -xc %s | \ +// RUN: %clang -cc1 -fvisibility default -DSTORAGE="extern" -o - -emit-interface-stubs -std=c99 -xc %s | \ // RUN: FileCheck -check-prefix=CHECK-EXTERN %s // RUN: %clang -fvisibility=default -DSTORAGE="extern" -O0 -o - -c -std=c99 \ // RUN: -xc %s | llvm-nm - 2>&1 | FileCheck -check-prefix=CHECK-EXTERN %s -// RUN: %clang -fvisibility=default -c -DSTORAGE="extern" -o - -emit-interface-stubs -std=c99 -xc %s | \ +// RUN: %clang -cc1 -fvisibility default -DSTORAGE="extern" -o - -emit-interface-stubs -std=c99 -xc %s | \ // RUN: FileCheck -check-prefix=CHECK-EXTERN2 %s // RUN: %clang -fvisibility=default -DSTORAGE="extern" -O0 -o - -c -std=c99 -xc %s | llvm-nm - 2>&1 | \ // RUN: FileCheck -check-prefix=CHECK-EXTERN2 %s -// RUN: %clang -fvisibility=default -c -DSTORAGE="static" -o - -emit-interface-stubs -std=c99 -xc %s | \ +// RUN: %clang -cc1 -fvisibility default -DSTORAGE="static" -o - -emit-interface-stubs -std=c99 -xc %s | \ // RUN: FileCheck -check-prefix=CHECK-STATIC %s // RUN: %clang -fvisibility=default -DSTORAGE="static" -O0 -o - -c -std=c99 -xc %s | llvm-nm - 2>&1 | \ diff --git a/clang/test/InterfaceStubs/function-template-specialization.cpp b/clang/test/InterfaceStubs/function-template-specialization.cpp index f6ec64bcd916..5198bafa2e5c 100644 --- a/clang/test/InterfaceStubs/function-template-specialization.cpp +++ b/clang/test/InterfaceStubs/function-template-specialization.cpp @@ -1,16 +1,12 @@ // REQUIRES: x86-registered-target -// TODO: Fix the case in llvm-ifs where it crashes on an empty Symbols list. -// RUN: %clang -target x86_64-unknown-linux-gnu -o - -emit-interface-stubs -c \ -// RUN: -interface-stub-version=experimental-ifs-v1 %s | FileCheck %s +// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -o - -emit-interface-stubs %s | FileCheck %s -// RUN: %clang -target x86_64-unknown-linux-gnu -o - -emit-interface-stubs -emit-merged-ifs \ -// RUN: -interface-stub-version=experimental-ifs-v1 \ +// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -o - -emit-interface-stubs \ // RUN: -DUSE_TEMPLATE_FUNCTION=1 %s | \ // RUN: FileCheck -check-prefix=CHECK-USES-TEMPLATE-FUNCTION %s -// RUN: %clang -target x86_64-unknown-linux-gnu -o - -emit-interface-stubs -emit-merged-ifs \ -// RUN: -interface-stub-version=experimental-ifs-v1 \ +// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -o - -emit-interface-stubs \ // RUN: -DSPECIALIZE_TEMPLATE_FUNCTION=1 %s | \ // RUN: FileCheck -check-prefix=CHECK-SPECIALIZES-TEMPLATE-FUNCTION %s diff --git a/clang/test/InterfaceStubs/hidden-class-inheritance.cpp b/clang/test/InterfaceStubs/hidden-class-inheritance.cpp index 8df165b6de91..19ba579608ec 100644 --- a/clang/test/InterfaceStubs/hidden-class-inheritance.cpp +++ b/clang/test/InterfaceStubs/hidden-class-inheritance.cpp @@ -1,6 +1,5 @@ // REQUIRES: x86-registered-target -// RUN: %clang -target x86_64-unknown-linux-gnu -o - -emit-interface-stubs \ -// RUN: -interface-stub-version=experimental-ifs-v1 \ +// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -o - -emit-interface-stubs \ // RUN: -DPARENT_CLASS_VISIBILITY="" -DCHILD_CLASS_VISIBILITY="" \ // RUN: -DPARENT_METHOD_VISIBILITY="" -DCHILD_METHOD_VISIBILITY="" %s | \ // RUN: FileCheck -check-prefix=CHECK-X %s @@ -10,12 +9,11 @@ // RUN: llvm-readelf -s - 2>&1 | \ // RUN: FileCheck -check-prefix=CHECK-X-RE %s -// RUN: %clang -target x86_64-unknown-linux-gnu -o - -emit-interface-stubs \ -// RUN: -interface-stub-version=experimental-ifs-v1 \ +// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -o - -emit-interface-stubs \ // RUN: -DPARENT_CLASS_VISIBILITY=HIDDEN -DCHILD_CLASS_VISIBILITY="" \ // RUN: -DPARENT_METHOD_VISIBILITY="" -DCHILD_METHOD_VISIBILITY="" %s | \ // RUN: FileCheck -check-prefix=CHECK-HP %s -// RUN: %clang -target x86_64-unknown-linux-gnu -o - -emit-interface-stubs \ +// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -o - -emit-interface-stubs \ // RUN: -interface-stub-version=experimental-ifs-v1 \ // RUN: -DPARENT_CLASS_VISIBILITY=HIDDEN -DCHILD_CLASS_VISIBILITY="" \ // RUN: -DPARENT_METHOD_VISIBILITY="" -DCHILD_METHOD_VISIBILITY="" %s | \ @@ -26,13 +24,11 @@ // RUN: llvm-readelf -s - 2>&1 | \ // RUN: FileCheck -check-prefix=CHECK-HP-RE %s -// RUN: %clang -target x86_64-unknown-linux-gnu -o - -emit-interface-stubs \ -// RUN: -interface-stub-version=experimental-ifs-v1 \ +// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -o - -emit-interface-stubs \ // RUN: -DPARENT_CLASS_VISIBILITY="" -DCHILD_CLASS_VISIBILITY=HIDDEN \ // RUN: -DPARENT_METHOD_VISIBILITY="" -DCHILD_METHOD_VISIBILITY="" %s | \ // RUN: FileCheck -check-prefix=CHECK-HC %s -// RUN: %clang -target x86_64-unknown-linux-gnu -o - -emit-interface-stubs \ -// RUN: -interface-stub-version=experimental-ifs-v1 \ +// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -o - -emit-interface-stubs \ // RUN: -DPARENT_CLASS_VISIBILITY="" -DCHILD_CLASS_VISIBILITY=HIDDEN \ // RUN: -DPARENT_METHOD_VISIBILITY="" -DCHILD_METHOD_VISIBILITY="" %s | \ // RUN: FileCheck -check-prefix=CHECK-HC2 %s @@ -42,8 +38,7 @@ // RUN: llvm-readelf -s - 2>&1 | \ // RUN: FileCheck -check-prefix=CHECK-HC-RE %s -// RUN: %clang -target x86_64-unknown-linux-gnu -o - -emit-interface-stubs \ -// RUN: -interface-stub-version=experimental-ifs-v1 \ +// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -o - -emit-interface-stubs \ // RUN: -DPARENT_CLASS_VISIBILITY=HIDDEN -DCHILD_CLASS_VISIBILITY=HIDDEN \ // RUN: -DPARENT_METHOD_VISIBILITY="" -DCHILD_METHOD_VISIBILITY="" %s | \ // RUN: FileCheck -check-prefix=CHECK-HP-HC %s diff --git a/clang/test/InterfaceStubs/indirect-field-decl.cpp b/clang/test/InterfaceStubs/indirect-field-decl.cpp index 5331a952645e..d0e5fd26e4b7 100644 --- a/clang/test/InterfaceStubs/indirect-field-decl.cpp +++ b/clang/test/InterfaceStubs/indirect-field-decl.cpp @@ -1,4 +1,4 @@ -// RUN: %clang -c -o - -emit-interface-stubs %s | FileCheck %s +// RUN: %clang_cc1 -o - -emit-interface-stubs %s | FileCheck %s // CHECK: --- !experimental-ifs-v1 // CHECK-NEXT: IfsVersion: 1.0 diff --git a/clang/test/InterfaceStubs/inline.c b/clang/test/InterfaceStubs/inline.c index b724f1e6583b..3ff7db9597a9 100644 --- a/clang/test/InterfaceStubs/inline.c +++ b/clang/test/InterfaceStubs/inline.c @@ -1,31 +1,31 @@ // REQUIRES: x86-registered-target -// RUN: %clang -c -DINLINE=inline -target x86_64-unknown-linux-gnu -o - \ +// RUN: %clang_cc1 -DINLINE=inline -triple x86_64-unknown-linux-gnu -o - \ // RUN: -emit-interface-stubs -std=gnu89 -xc %s | \ // RUN: FileCheck -check-prefix=CHECK-GNU %s // RUN: %clang -DINLINE=inline -target x86_64-linux-gnu -O0 -o - -c \ // RUN: -std=gnu89 -xc %s | llvm-nm - | FileCheck -check-prefix=CHECK-GNU %s -// RUN: %clang -c -DINLINE="__attribute__((always_inline))" \ -// RUN: -target x86_64-unknown-linux-gnu -o - -emit-interface-stubs -xc %s | \ +// RUN: %clang_cc1 -DINLINE="__attribute__((always_inline))" \ +// RUN: -triple x86_64-unknown-linux-gnu -o - -emit-interface-stubs -xc %s | \ // RUN: FileCheck -check-prefix=CHECK-GNU %s // RUN: %clang -DINLINE="__attribute__((always_inline))" \ // RUN: -target x86_64-linux-gnu -O0 -o - -c -xc %s | \ // RUN: llvm-nm - | FileCheck -check-prefix=CHECK-GNU %s -// RUN: %clang -c -DINLINE=inline -target x86_64-unknown-linux-gnu -o - \ +// RUN: %clang_cc1 -DINLINE=inline -triple x86_64-unknown-linux-gnu -o - \ // RUN: -emit-interface-stubs -std=c99 -xc %s | \ // RUN: FileCheck -check-prefix=CHECK-STD %s // RUN: %clang -DINLINE=inline -target x86_64-linux-gnu -O0 -o - -c -std=c99 \ // RUN: -xc %s | llvm-nm - 2>&1 | FileCheck -check-prefix=CHECK-STD %s -// RUN: %clang -c -DINLINE="__attribute__((noinline))" \ -// RUN: -target x86_64-unknown-linux-gnu -o - -emit-interface-stubs -std=c99 -xc %s | \ +// RUN: %clang_cc1 -DINLINE="__attribute__((noinline))" \ +// RUN: -triple x86_64-unknown-linux-gnu -o - -emit-interface-stubs -std=c99 -xc %s | \ // RUN: FileCheck -check-prefix=CHECK-NOINLINE %s // RUN: %clang -DINLINE="__attribute__((noinline))" -target x86_64-linux-gnu \ // RUN: -O0 -o - -c -std=c99 -xc %s | llvm-nm - 2>&1 | \ // RUN: FileCheck -check-prefix=CHECK-NOINLINE %s -// RUN: %clang -c -DINLINE="static" -target x86_64-unknown-linux-gnu -o - \ +// RUN: %clang_cc1 -DINLINE="static" -triple x86_64-unknown-linux-gnu -o - \ // RUN: -emit-interface-stubs -std=c99 -xc %s | \ // RUN: FileCheck -check-prefix=CHECK-STATIC %s // RUN: %clang -DINLINE="static" -target x86_64-linux-gnu -O0 -o - -c \ @@ -45,11 +45,11 @@ INLINE int foo() { return var; } -// RUN: %clang -c -DINLINE=inline -target x86_64-linux-gnu -o - \ +// RUN: %clang_cc1 -DINLINE=inline -triple x86_64-linux-gnu -o - \ // RUN: -emit-interface-stubs \ // RUN: -std=gnu89 -xc %s | FileCheck -check-prefix=CHECK-TAPI %s -// RUN: %clang -c -DINLINE=inline -target x86_64-linux-gnu -o - \ +// RUN: %clang_cc1 -DINLINE=inline -triple x86_64-linux-gnu -o - \ // RUN: -emit-interface-stubs \ // RUN: -std=gnu89 -xc %s | FileCheck -check-prefix=CHECK-SYMBOLS %s // RUN: %clang -DINLINE=inline -target x86_64-linux-gnu -o - \ diff --git a/clang/test/InterfaceStubs/namespace.cpp b/clang/test/InterfaceStubs/namespace.cpp index 99ebadfa59ee..1c62346d22fc 100644 --- a/clang/test/InterfaceStubs/namespace.cpp +++ b/clang/test/InterfaceStubs/namespace.cpp @@ -1,4 +1,4 @@ -// RUN: %clang -c -o - -emit-interface-stubs %s | FileCheck %s +// RUN: %clang_cc1 -o - -emit-interface-stubs %s | FileCheck %s // CHECK: --- !experimental-ifs-v1 // CHECK-NEXT: IfsVersion: 1.0 diff --git a/clang/test/InterfaceStubs/non-type-template-parm-decl.cpp b/clang/test/InterfaceStubs/non-type-template-parm-decl.cpp index 4d3f4d7ced8b..51176ac0ba0b 100644 --- a/clang/test/InterfaceStubs/non-type-template-parm-decl.cpp +++ b/clang/test/InterfaceStubs/non-type-template-parm-decl.cpp @@ -1,4 +1,4 @@ -// RUN: %clang -c -o - -emit-interface-stubs %s | FileCheck %s +// RUN: %clang_cc1 -o - -emit-interface-stubs %s | FileCheck %s // CHECK: --- !experimental-ifs-v1 // CHECK-NEXT: IfsVersion: 1.0 diff --git a/clang/test/InterfaceStubs/object.c b/clang/test/InterfaceStubs/object.c index e81b82754e57..d6e28c5f884a 100644 --- a/clang/test/InterfaceStubs/object.c +++ b/clang/test/InterfaceStubs/object.c @@ -1,5 +1,4 @@ -// RUN: %clang -fvisibility=default -c -o - -emit-interface-stubs %s | FileCheck -check-prefix=CHECK-TAPI %s -// RUN: %clang -fvisibility=default -c -o - -emit-interface-stubs %s | FileCheck -check-prefix=CHECK-SYMBOLS %s +// RUN: %clang_cc1 -fvisibility default -o - -emit-interface-stubs %s | FileCheck -check-prefix=CHECK-TAPI %s // RUN: %clang -fvisibility=default -c -o - %s | llvm-nm - 2>&1 | FileCheck -check-prefix=CHECK-SYMBOLS %s // CHECK-TAPI: data" : { Type: Object, Size: 4 } diff --git a/clang/test/InterfaceStubs/template-constexpr.cpp b/clang/test/InterfaceStubs/template-constexpr.cpp index 25d67d378c73..c4c7afa42f1e 100644 --- a/clang/test/InterfaceStubs/template-constexpr.cpp +++ b/clang/test/InterfaceStubs/template-constexpr.cpp @@ -1,4 +1,4 @@ -// RUN: %clang -c -o - -emit-interface-stubs %s | FileCheck %s +// RUN: %clang_cc1 -o - -emit-interface-stubs %s | FileCheck %s // CHECK: --- !experimental-ifs-v1 // CHECK-NEXT: IfsVersion: 1.0 diff --git a/clang/test/InterfaceStubs/template-namespace-function.cpp b/clang/test/InterfaceStubs/template-namespace-function.cpp index ad8606757c9e..47788d4a3e0a 100644 --- a/clang/test/InterfaceStubs/template-namespace-function.cpp +++ b/clang/test/InterfaceStubs/template-namespace-function.cpp @@ -1,16 +1,15 @@ // REQUIRES: x86-registered-target -// RUN: %clang -target x86_64-unknown-linux-gnu -o - -emit-interface-stubs -emit-merged-ifs \ -// RUN: -interface-stub-version=experimental-ifs-v1 %s | \ +// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -o - -emit-interface-stubs %s | \ // RUN: FileCheck %s // RUN: %clang -target x86_64-unknown-linux-gnu -o - -c %s | llvm-nm - 2>&1 | \ // RUN: FileCheck -check-prefix=CHECK-SYMBOLS %s // CHECK: Symbols: -// CHECK-DAG: _ZN3qux3barEii: { Type: Func } -// CHECK-DAG: _ZN3baz3addIiEET_S1_S1_: { Type: Func } -// CHECK-DAG: _Z4fbarff: { Type: Func } -// CHECK-DAG: _ZN3baz3addIfEET_S1_S1_: { Type: Func } +// CHECK-DAG: "_ZN3qux3barEii" : { Type: Func } +// CHECK-DAG: "_ZN3baz3addIiEET_S1_S1_" : { Type: Func } +// CHECK-DAG: "_Z4fbarff" : { Type: Func } +// CHECK-DAG: "_ZN3baz3addIfEET_S1_S1_" : { Type: Func } // Same symbols just diff erent order. // CHECK-SYMBOLS-DAG: _Z4fbarff diff --git a/clang/test/InterfaceStubs/template-template-parm-decl.cpp b/clang/test/InterfaceStubs/template-template-parm-decl.cpp index b09d732ea4cd..63883536a816 100644 --- a/clang/test/InterfaceStubs/template-template-parm-decl.cpp +++ b/clang/test/InterfaceStubs/template-template-parm-decl.cpp @@ -1,4 +1,4 @@ -// RUN: %clang -c -o - -emit-interface-stubs %s | FileCheck %s +// RUN: %clang_cc1 -o - -emit-interface-stubs %s | FileCheck %s // CHECK: --- !experimental-ifs-v1 // CHECK-NEXT: IfsVersion: 1.0 diff --git a/clang/test/InterfaceStubs/trycatch.cpp b/clang/test/InterfaceStubs/trycatch.cpp index 310e9038f1a5..57076a097cb5 100644 --- a/clang/test/InterfaceStubs/trycatch.cpp +++ b/clang/test/InterfaceStubs/trycatch.cpp @@ -1,6 +1,6 @@ // REQUIRES: x86-registered-target -// RUN: %clang -target x86_64-unknown-linux-gnu -c -o - -emit-interface-stubs %s | FileCheck %s +// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -fcxx-exceptions -o - -emit-interface-stubs %s | FileCheck %s // CHECK: --- !experimental-ifs-v1 @@ -12,4 +12,4 @@ // CHECK-NEXT: ... class C5 {}; -void f() { try {} catch(C5&){} } \ No newline at end of file +void f() { try {} catch(C5&){} } diff --git a/clang/test/InterfaceStubs/usings.cpp b/clang/test/InterfaceStubs/usings.cpp index c6057a1dd339..735a040c91dc 100644 --- a/clang/test/InterfaceStubs/usings.cpp +++ b/clang/test/InterfaceStubs/usings.cpp @@ -1,4 +1,4 @@ -// RUN: %clang -c -o - -emit-interface-stubs %s | FileCheck %s +// RUN: %clang_cc1 -o - -emit-interface-stubs %s | FileCheck %s // CHECK: --- !experimental-ifs-v1 // CHECK-NEXT: IfsVersion: 1.0 diff --git a/clang/test/InterfaceStubs/var-template-specialization-decl.cpp b/clang/test/InterfaceStubs/var-template-specialization-decl.cpp index 81cc70aaee6a..bbb5ae888977 100644 --- a/clang/test/InterfaceStubs/var-template-specialization-decl.cpp +++ b/clang/test/InterfaceStubs/var-template-specialization-decl.cpp @@ -1,5 +1,5 @@ // REQUIRES: x86-registered-target -// RUN: %clang -target x86_64-unknown-linux-gnu -c -o - -emit-interface-stubs %s | FileCheck %s +// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -o - -emit-interface-stubs %s | FileCheck %s // CHECK: --- !experimental-ifs-v1 // CHECK-NEXT: IfsVersion: 1.0 @@ -14,4 +14,4 @@ template<typename T, T v> struct S9 { }; template<typename T> struct S0 : public S9<bool, true> { }; template<typename T> constexpr bool CE2 = S0<T>::value; -int a = CE2<int>; \ No newline at end of file +int a = CE2<int>; diff --git a/clang/test/InterfaceStubs/virtual.cpp b/clang/test/InterfaceStubs/virtual.cpp index ec405770be3f..cea58aac8771 100644 --- a/clang/test/InterfaceStubs/virtual.cpp +++ b/clang/test/InterfaceStubs/virtual.cpp @@ -1,9 +1,7 @@ // REQUIRES: x86-registered-target -// RUN: %clang -target x86_64-unknown-linux-gnu -o - -emit-interface-stubs \ -// RUN: -interface-stub-version=experimental-ifs-v1 %s | \ +// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -o - -emit-interface-stubs %s | \ // RUN: FileCheck -check-prefix=CHECK-TAPI %s -// RUN: %clang -target x86_64-unknown-linux-gnu -o - -emit-interface-stubs \ -// RUN: -interface-stub-version=experimental-ifs-v1 %s | \ +// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -o - -emit-interface-stubs %s | \ // RUN: FileCheck -check-prefix=CHECK-TAPI2 %s // RUN: %clang -target x86_64-unknown-linux-gnu -o - -c %s | \ // RUN: llvm-readelf -s - 2>&1 | FileCheck -check-prefix=CHECK-SYMBOLS %s diff --git a/clang/test/InterfaceStubs/visibility.cpp b/clang/test/InterfaceStubs/visibility.cpp index 1f0e921f5197..223be53d46d8 100644 --- a/clang/test/InterfaceStubs/visibility.cpp +++ b/clang/test/InterfaceStubs/visibility.cpp @@ -1,26 +1,20 @@ // REQUIRES: x86-registered-target -// RUN: %clang -target x86_64-unknown-linux-gnu -o - -emit-interface-stubs \ -// RUN: -interface-stub-version=experimental-ifs-v1 -fvisibility=hidden \ -// RUN: %s | FileCheck --check-prefix=CHECK-CMD-HIDDEN %s +// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -o - -emit-interface-stubs \ +// RUN: -fvisibility hidden %s | FileCheck --check-prefix=CHECK-CMD-HIDDEN %s -// RUN: %clang -target x86_64-unknown-linux-gnu -o - -emit-interface-stubs \ -// RUN: -interface-stub-version=experimental-ifs-v1 -fvisibility=hidden \ -// RUN: %s | FileCheck --check-prefix=CHECK-CMD-HIDDEN %s +// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -o - -emit-interface-stubs \ +// RUN: -fvisibility hidden %s | FileCheck --check-prefix=CHECK-CMD-HIDDEN %s -// RUN: %clang -target x86_64-unknown-linux-gnu -o - -emit-interface-stubs \ -// RUN: -interface-stub-version=experimental-ifs-v1 %s | \ +// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -o - -emit-interface-stubs %s | \ // RUN: FileCheck --check-prefix=CHECK-CMD %s -// RUN: %clang -target x86_64-unknown-linux-gnu -o - -emit-interface-stubs \ -// RUN: -interface-stub-version=experimental-ifs-v1 %s | \ +// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -o - -emit-interface-stubs %s | \ // RUN: FileCheck --check-prefix=CHECK-CMD %s -// RUN: %clang -target x86_64-unknown-linux-gnu -o - -emit-interface-stubs \ -// RUN: -interface-stub-version=experimental-ifs-v1 %s | \ +// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -o - -emit-interface-stubs %s | \ // RUN: FileCheck --check-prefix=CHECK-CMD2 %s -// RUN: %clang -target x86_64-unknown-linux-gnu -o - -emit-interface-stubs \ -// RUN: -interface-stub-version=experimental-ifs-v1 %s | \ +// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -o - -emit-interface-stubs %s | \ // RUN: FileCheck --check-prefix=CHECK-CMD2 %s // RUN: %clang -target x86_64-unknown-linux-gnu -o - -c %s | llvm-readelf -s - 2>&1 | \ diff --git a/clang/test/InterfaceStubs/weak.cpp b/clang/test/InterfaceStubs/weak.cpp index e1c2c232a9d8..1581ffa9d5d7 100644 --- a/clang/test/InterfaceStubs/weak.cpp +++ b/clang/test/InterfaceStubs/weak.cpp @@ -1,5 +1,5 @@ // REQUIRES: x86-registered-target -// RUN: %clang -target x86_64-linux-gnu -o - -emit-interface-stubs -emit-merged-ifs \ +// RUN: %clang_cc1 -triple x86_64-linux-gnu -o - -emit-interface-stubs \ // RUN: -interface-stub-version=experimental-ifs-v1 %s | \ // RUN: FileCheck %s @@ -7,8 +7,8 @@ // RUN: FileCheck -check-prefix=CHECK-SYMBOLS %s // CHECK: Symbols: -// CHECK-DAG: _Z8weakFuncv: { Type: Func, Weak: true } -// CHECK-DAG: _Z10strongFuncv: { Type: Func } +// CHECK-DAG: "_Z8weakFuncv" : { Type: Func, Weak: true } +// CHECK-DAG: "_Z10strongFuncv" : { Type: Func } // CHECK-SYMBOLS-DAG: _Z10strongFuncv // CHECK-SYMBOLS-DAG: _Z8weakFuncv diff --git a/clang/test/InterfaceStubs/windows.cpp b/clang/test/InterfaceStubs/windows.cpp index 5bf5a688e180..609145b3def0 100644 --- a/clang/test/InterfaceStubs/windows.cpp +++ b/clang/test/InterfaceStubs/windows.cpp @@ -1,7 +1,15 @@ // REQUIRES: x86-registered-target -// RUN: %clang -target x86_64-windows-msvc -o - %s \ -// RUN: -emit-interface-stubs -emit-merged-ifs | FileCheck %s +// RUN: %clang_cc1 -triple x86_64-windows-msvc -o - %s -emit-interface-stubs | FileCheck -check-prefix=CHECK-CC1 %s +// RUN: %clang -target x86_64-windows-msvc -o - %s -emit-interface-stubs -emit-merged-ifs | FileCheck -check-prefix=CHECK-IFS %s + +// CHECK-CC1: Symbols: +// CHECK-CC1-NEXT: ?helloWindowsMsvc@@YAHXZ + + // CHECK-IFS: --- !experimental-ifs-v1 + // CHECK-IFS: IfsVersion: 1.0 + // CHECK-IFS: Triple: x86_64-unknown-windows-msvc19.11.0 + // CHECK-IFS: Symbols: + // CHECK-IFS: ?helloWindowsMsvc@@YAHXZ: { Type: Func } + // CHECK-IFS: ... -// CHECK: Symbols: -// CHECK-NEXT: ?helloWindowsMsvc@@YAHXZ int helloWindowsMsvc(); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
