From 8bba0059bf07a3061a0ac51b494459a85fd78414 Mon Sep 17 00:00:00 2001 From: Hans Wennborg Date: Mon, 13 Jan 2014 19:48:13 +0000 Subject: [PATCH] Update tests in preparation for using the MS ABI for Win32 targets In preparation for making the Win32 triple imply MS ABI mode, make all tests pass in this mode, or make them use the Itanium mode explicitly. Differential Revision: http://llvm-reviews.chandlerc.com/D2401 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@199130 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../inlining/dyn-dispatch-bifurcate.cpp | 2 +- test/CXX/dcl.dcl/dcl.link/p7.cpp | 4 +- .../CXX/dcl.dcl/dcl.spec/dcl.constexpr/p2.cpp | 2 +- test/CXX/drs/dr2xx.cpp | 35 ++++++++++--- .../special/class.copy/implicit-move-def.cpp | 6 +-- test/CXX/special/class.dtor/p3-0x.cpp | 2 +- test/CXX/special/class.dtor/p9.cpp | 28 ++++++++++- test/CodeGen/builtin-ms-noop.cpp | 3 +- test/CodeGen/captured-statements.c | 2 +- test/CodeGen/complex-convert.c | 11 +++-- test/CodeGen/cxx-default-arg.cpp | 2 +- test/CodeGen/fp-contract-pragma.cpp | 2 +- test/CodeGen/overloadable.c | 2 +- test/CodeGen/tbaa-for-vptr.cpp | 10 ++-- test/CodeGenCUDA/filter-decl.cu | 4 +- test/CodeGenCXX/instr-profile.cpp | 8 +-- test/CodeGenObjC/debug-info-self.m | 2 +- test/CodeGenObjC/overloadable.m | 8 +-- test/CodeGenObjCXX/arc-mangle.mm | 2 +- test/CodeGenOpenCL/address-spaces-mangling.cl | 4 +- test/CodeGenOpenCL/local.cl | 2 +- test/PCH/cxx-reference.cpp | 6 +-- test/PCH/cxx-required-decls.cpp | 6 +-- test/PCH/cxx-templates.cpp | 22 ++++----- test/PCH/irgen-rdar13114142.mm | 4 +- test/PCH/objc_literals.mm | 8 +-- test/PCH/objcxx-ivar-class.mm | 6 +-- test/Sema/empty1.c | 5 +- test/SemaCXX/deleted-operator.cpp | 5 +- test/SemaCXX/destructor.cpp | 17 ++++++- .../implicit-virtual-member-functions.cpp | 8 ++- test/SemaCXX/primary-base.cpp | 2 +- test/SemaCXX/typeid-ref.cpp | 2 +- test/SemaCXX/undefined-internal.cpp | 5 +- test/SemaCXX/virtual-base-used.cpp | 49 ++++++++++++++++++- test/SemaCXX/warn-reinterpret-base-class.cpp | 18 ++++++- test/SemaCXX/warn-weak-vtables.cpp | 3 +- .../inject-templated-friend-post.cpp | 13 +++-- test/SemaTemplate/inject-templated-friend.cpp | 4 +- test/SemaTemplate/instantiate-complete.cpp | 10 +++- .../instantiate-exception-spec-cxx11.cpp | 5 +- .../SemaTemplate/virtual-member-functions.cpp | 10 +++- 42 files changed, 255 insertions(+), 94 deletions(-) diff --git a/test/Analysis/inlining/dyn-dispatch-bifurcate.cpp b/test/Analysis/inlining/dyn-dispatch-bifurcate.cpp index d219446fc9..e23d4e23a4 100644 --- a/test/Analysis/inlining/dyn-dispatch-bifurcate.cpp +++ b/test/Analysis/inlining/dyn-dispatch-bifurcate.cpp @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -analyze -analyzer-checker=core,debug.ExprInspection -analyzer-config ipa=dynamic-bifurcate -verify %s +// RUN: %clang_cc1 -analyze -analyzer-checker=core,debug.ExprInspection -analyzer-config ipa=dynamic-bifurcate -verify -Wno-reinterpret-base-class %s void clang_analyzer_eval(bool); diff --git a/test/CXX/dcl.dcl/dcl.link/p7.cpp b/test/CXX/dcl.dcl/dcl.link/p7.cpp index bd9ff3c366..bc0eb17fda 100644 --- a/test/CXX/dcl.dcl/dcl.link/p7.cpp +++ b/test/CXX/dcl.dcl/dcl.link/p7.cpp @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -emit-llvm -o - %s | FileCheck %s +// RUN: %clang_cc1 -cxx-abi itanium -emit-llvm -o - %s | FileCheck %s struct X { }; @@ -7,8 +7,6 @@ struct X { }; // CHECK: @x2 = external global %struct.X // CHECK: @x3 = external global %struct.X extern "C" { - - X x1; } diff --git a/test/CXX/dcl.dcl/dcl.spec/dcl.constexpr/p2.cpp b/test/CXX/dcl.dcl/dcl.spec/dcl.constexpr/p2.cpp index 001a086a00..f6bdb4217e 100644 --- a/test/CXX/dcl.dcl/dcl.spec/dcl.constexpr/p2.cpp +++ b/test/CXX/dcl.dcl/dcl.spec/dcl.constexpr/p2.cpp @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -std=c++11 -emit-llvm %s -o - | FileCheck %s +// RUN: %clang_cc1 -std=c++11 -emit-llvm -cxx-abi itanium %s -o - | FileCheck %s // constexpr functions and constexpr constructors are implicitly inline. struct S { diff --git a/test/CXX/drs/dr2xx.cpp b/test/CXX/drs/dr2xx.cpp index 563ca50f11..28d495367d 100644 --- a/test/CXX/drs/dr2xx.cpp +++ b/test/CXX/drs/dr2xx.cpp @@ -1,6 +1,10 @@ -// RUN: %clang_cc1 -std=c++98 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors -// RUN: %clang_cc1 -std=c++11 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors -// RUN: %clang_cc1 -std=c++1y %s -verify -fexceptions -fcxx-exceptions -pedantic-errors +// RUN: %clang_cc1 -std=c++98 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors -cxx-abi itanium +// RUN: %clang_cc1 -std=c++11 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors -cxx-abi itanium +// RUN: %clang_cc1 -std=c++1y %s -verify -fexceptions -fcxx-exceptions -pedantic-errors -cxx-abi itanium + +// RUN: %clang_cc1 -std=c++98 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors -cxx-abi microsoft -DMSABI +// RUN: %clang_cc1 -std=c++11 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors -cxx-abi microsoft -DMSABI +// RUN: %clang_cc1 -std=c++1y %s -verify -fexceptions -fcxx-exceptions -pedantic-errors -cxx-abi microsoft -DMSABI // PR13819 -- __SIZE_TYPE__ is incompatible. typedef __SIZE_TYPE__ size_t; // expected-error 0-1 {{extension}} @@ -534,17 +538,30 @@ namespace dr250 { // dr250: yes namespace dr252 { // dr252: yes struct A { +#ifdef MSABI + // expected-note@+2 {{found}} +#endif void operator delete(void*); // expected-note {{found}} }; struct B { +#ifdef MSABI + // expected-note@+2 {{found}} +#endif void operator delete(void*); // expected-note {{found}} }; struct C : A, B { +#ifdef MSABI + // expected-error@+2 {{'operator delete' found in multiple base classes}} +#endif virtual ~C(); }; C::~C() {} // expected-error {{'operator delete' found in multiple base classes}} struct D { +#ifdef MSABI + // expected-note@+3 {{here}} MSABI + // expected-error@+3 {{no suitable member 'operator delete'}} +#endif void operator delete(void*, int); // expected-note {{here}} virtual ~D(); }; @@ -552,18 +569,22 @@ namespace dr252 { // dr252: yes struct E { void operator delete(void*, int); - void operator delete(void*) = delete; // expected-error 0-1{{extension}} expected-note {{here}} - virtual ~E(); + void operator delete(void*) = delete; // expected-error 0-1{{extension}} expected-note 1-2 {{here}} + virtual ~E(); // expected-error 0-1 {{attempt to use a deleted function}} }; - E::~E() {} // expected-error {{deleted}} + E::~E() {} // expected-error {{attempt to use a deleted function}} struct F { // If both functions are available, the first one is a placement delete. void operator delete(void*, size_t); +#ifdef MSABI + // expected-note@+3 {{here}} + // expected-error@+3 {{attempt to use a deleted function}} +#endif void operator delete(void*) = delete; // expected-error 0-1{{extension}} expected-note {{here}} virtual ~F(); }; - F::~F() {} // expected-error {{deleted}} + F::~F() {} // expected-error {{attempt to use a deleted function}} struct G { void operator delete(void*, size_t); diff --git a/test/CXX/special/class.copy/implicit-move-def.cpp b/test/CXX/special/class.copy/implicit-move-def.cpp index 5696d1f579..e2550aed3f 100644 --- a/test/CXX/special/class.copy/implicit-move-def.cpp +++ b/test/CXX/special/class.copy/implicit-move-def.cpp @@ -1,6 +1,6 @@ -// FIXME: %clang_cc1 -emit-llvm -o - -std=c++11 %s | FileCheck -check-prefix=CHECK %s -// RUN: %clang_cc1 -emit-llvm -o - -std=c++11 %s | FileCheck -check-prefix=CHECK-ASSIGN %s -// RUN: %clang_cc1 -emit-llvm -o - -std=c++11 %s | FileCheck -check-prefix=CHECK-CTOR %s +// FIXME: %clang_cc1 -emit-llvm -cxx-abi itanium -o - -std=c++11 %s | FileCheck -check-prefix=CHECK %s +// RUN: %clang_cc1 -emit-llvm -cxx-abi itanium -o - -std=c++11 %s | FileCheck -check-prefix=CHECK-ASSIGN %s +// RUN: %clang_cc1 -emit-llvm -cxx-abi itanium -o - -std=c++11 %s | FileCheck -check-prefix=CHECK-CTOR %s // construct diff --git a/test/CXX/special/class.dtor/p3-0x.cpp b/test/CXX/special/class.dtor/p3-0x.cpp index dc76e00308..bb1f90727d 100644 --- a/test/CXX/special/class.dtor/p3-0x.cpp +++ b/test/CXX/special/class.dtor/p3-0x.cpp @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -std=c++11 -fexceptions -fcxx-exceptions -emit-llvm -o - %s | FileCheck %s +// RUN: %clang_cc1 -std=c++11 -cxx-abi itanium -fexceptions -fcxx-exceptions -emit-llvm -o - %s | FileCheck %s struct A { ~A(); diff --git a/test/CXX/special/class.dtor/p9.cpp b/test/CXX/special/class.dtor/p9.cpp index 8b76a15078..6b28ebfd6e 100644 --- a/test/CXX/special/class.dtor/p9.cpp +++ b/test/CXX/special/class.dtor/p9.cpp @@ -1,4 +1,5 @@ -// RUN: %clang_cc1 -fsyntax-only -verify %s +// RUN: %clang_cc1 -fsyntax-only -cxx-abi itanium -verify %s +// RUN: %clang_cc1 -fsyntax-only -cxx-abi microsoft -DMSABI -verify %s typedef typeof(sizeof(int)) size_t; @@ -28,12 +29,18 @@ namespace test0 { namespace test1 { class A { public: +#ifdef MSABI + // expected-note@+2 {{declared here}} +#endif static void operator delete(void *p) {}; // expected-note {{member 'operator delete' declared here}} virtual ~A(); }; class B : protected A { public: +#ifdef MSABI + // expected-note@+2 {{declared here}} +#endif static void operator delete(void *, size_t) {}; // expected-note {{member 'operator delete' declared here}} ~B(); }; @@ -43,6 +50,9 @@ namespace test1 { using A::operator delete; using B::operator delete; +#ifdef MSABI + // expected-error@+2 {{multiple suitable 'operator delete' functions in 'C'}} +#endif ~C(); }; @@ -52,12 +62,22 @@ namespace test1 { // ...at the point of definition of a virtual destructor... namespace test2 { struct A { +#ifdef MSABI + // expected-error@+3 {{no suitable member 'operator delete' in 'A'}} + // expected-note@+3 {{declared here}} +#endif virtual ~A(); static void operator delete(void*, const int &); }; struct B { +#ifdef MSABI + // expected-error@+2 {{no suitable member 'operator delete' in 'B'}} +#endif virtual ~B(); +#ifdef MSABI + // expected-note@+2 {{declared here}} +#endif static void operator delete(void*, const int &); // expected-note {{declared here}} }; B::~B() {} // expected-error {{no suitable member 'operator delete' in 'B'}} @@ -74,7 +94,13 @@ namespace test2 { // PR7346 namespace test3 { struct A { +#ifdef MSABI + // expected-error@+2 {{no suitable member 'operator delete' in 'A'}} +#endif virtual ~A(); +#ifdef MSABI + // expected-note@+2 {{declared here}} +#endif static void operator delete(void*, const int &); }; diff --git a/test/CodeGen/builtin-ms-noop.cpp b/test/CodeGen/builtin-ms-noop.cpp index 7c5068dd61..b0987ccfa9 100644 --- a/test/CodeGen/builtin-ms-noop.cpp +++ b/test/CodeGen/builtin-ms-noop.cpp @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -fms-extensions -triple i686-pc-win32 -emit-llvm %s -o - | FileCheck %s +// RUN: %clang_cc1 -fms-extensions -triple i686-pc-win32 -cxx-abi itanium -emit-llvm %s -o - | FileCheck %s class A { public: @@ -11,4 +11,3 @@ void f() { // CHECK: ret void __noop(A()); }; - diff --git a/test/CodeGen/captured-statements.c b/test/CodeGen/captured-statements.c index c87c187350..8c8647899f 100644 --- a/test/CodeGen/captured-statements.c +++ b/test/CodeGen/captured-statements.c @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -emit-llvm %s -o %t +// RUN: %clang_cc1 -cxx-abi itanium -emit-llvm %s -o %t // RUN: FileCheck %s -input-file=%t -check-prefix=CHECK-GLOBALS // RUN: FileCheck %s -input-file=%t -check-prefix=CHECK-1 // RUN: FileCheck %s -input-file=%t -check-prefix=CHECK-2 diff --git a/test/CodeGen/complex-convert.c b/test/CodeGen/complex-convert.c index e35be9c149..6ecb884704 100644 --- a/test/CodeGen/complex-convert.c +++ b/test/CodeGen/complex-convert.c @@ -22,9 +22,14 @@ void foo(signed char sc, unsigned char uc, signed long long sll, _Complex signed long long csll1; _Complex unsigned long long cull1; // CHECK-LABEL: define void @foo( - // CHECK: alloca i[[CHSIZE:[0-9]+]], align [[CHALIGN:[0-9]+]] - // CHECK-NEXT: alloca i[[CHSIZE]], align [[CHALIGN]] - // CHECK-NEXT: alloca i[[LLSIZE:[0-9]+]], align [[LLALIGN:[0-9]+]] + // Match the prototype to pick up the size of sc and sll. + // CHECK: i[[CHSIZE:[0-9]+]]{{[^,]*}}, + // CHECK: i[[CHSIZE]]{{[^,]*}}, + // CHECK: i[[LLSIZE:[0-9]+]] + + // Match against the allocas to pick up the alignments. + // CHECK: alloca i[[CHSIZE]], align [[CHALIGN:[0-9]+]] + // CHECK: alloca i[[LLSIZE]], align [[LLALIGN:[0-9]+]] sc1 = csc; // CHECK: %[[VAR1:[A-Za-z0-9.]+]] = getelementptr inbounds { i[[CHSIZE]], i[[CHSIZE]] }* %[[CSC:[A-Za-z0-9.]+]], i{{[0-9]+}} 0, i{{[0-9]+}} 0 diff --git a/test/CodeGen/cxx-default-arg.cpp b/test/CodeGen/cxx-default-arg.cpp index 12e2666408..72cba948f4 100644 --- a/test/CodeGen/cxx-default-arg.cpp +++ b/test/CodeGen/cxx-default-arg.cpp @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -emit-llvm %s -o %t +// RUN: %clang_cc1 -cxx-abi itanium -emit-llvm %s -o %t // Note-LABEL: define CLANG_GENERATE_KNOWN_GOOD and compile to generate code // that makes all of the defaulted arguments explicit. The resulting diff --git a/test/CodeGen/fp-contract-pragma.cpp b/test/CodeGen/fp-contract-pragma.cpp index afd8c43121..37629af6f1 100644 --- a/test/CodeGen/fp-contract-pragma.cpp +++ b/test/CodeGen/fp-contract-pragma.cpp @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -O3 -emit-llvm -o - %s | FileCheck %s +// RUN: %clang_cc1 -O3 -cxx-abi itanium -emit-llvm -o - %s | FileCheck %s // Is FP_CONTRACT is honored in a simple case? float fp_contract_1(float a, float b, float c) { diff --git a/test/CodeGen/overloadable.c b/test/CodeGen/overloadable.c index 1ed72b19c4..ca6abf3fe9 100644 --- a/test/CodeGen/overloadable.c +++ b/test/CodeGen/overloadable.c @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -emit-llvm %s -o - | grep _Z1fPA10_1X +// RUN: %clang_cc1 -cxx-abi itanium -emit-llvm %s -o - | grep _Z1fPA10_1X int __attribute__((overloadable)) f(int x) { return x; } float __attribute__((overloadable)) f(float x) { return x; } double __attribute__((overloadable)) f(double x) { return x; } diff --git a/test/CodeGen/tbaa-for-vptr.cpp b/test/CodeGen/tbaa-for-vptr.cpp index 7ba058bffe..ebd5825259 100644 --- a/test/CodeGen/tbaa-for-vptr.cpp +++ b/test/CodeGen/tbaa-for-vptr.cpp @@ -1,9 +1,9 @@ -// RUN: %clang_cc1 -emit-llvm -o - -fsanitize=thread %s | FileCheck %s -// RUN: %clang_cc1 -emit-llvm -o - -O1 %s | FileCheck %s -// RUN: %clang_cc1 -emit-llvm -o - -O1 -relaxed-aliasing -fsanitize=thread %s | FileCheck %s +// RUN: %clang_cc1 -cxx-abi itanium -emit-llvm -o - -fsanitize=thread %s | FileCheck %s +// RUN: %clang_cc1 -cxx-abi itanium -emit-llvm -o - -O1 %s | FileCheck %s +// RUN: %clang_cc1 -cxx-abi itanium -emit-llvm -o - -O1 -relaxed-aliasing -fsanitize=thread %s | FileCheck %s // -// RUN: %clang_cc1 -emit-llvm -o - %s | FileCheck %s --check-prefix=NOTBAA -// RUN: %clang_cc1 -emit-llvm -o - -O2 -relaxed-aliasing %s | FileCheck %s --check-prefix=NOTBAA +// RUN: %clang_cc1 -cxx-abi itanium -emit-llvm -o - %s | FileCheck %s --check-prefix=NOTBAA +// RUN: %clang_cc1 -cxx-abi itanium -emit-llvm -o - -O2 -relaxed-aliasing %s | FileCheck %s --check-prefix=NOTBAA // // Check that we generate TBAA for vtable pointer loads and stores. // When -fthread-sanitizer is used TBAA should be generated at all opt levels diff --git a/test/CodeGenCUDA/filter-decl.cu b/test/CodeGenCUDA/filter-decl.cu index b758632d12..dda384861d 100644 --- a/test/CodeGenCUDA/filter-decl.cu +++ b/test/CodeGenCUDA/filter-decl.cu @@ -1,5 +1,5 @@ -// RUN: %clang_cc1 -emit-llvm %s -o - | FileCheck -check-prefix=CHECK-HOST %s -// RUN: %clang_cc1 -emit-llvm %s -o - -fcuda-is-device | FileCheck -check-prefix=CHECK-DEVICE %s +// RUN: %clang_cc1 -cxx-abi itanium -emit-llvm %s -o - | FileCheck -check-prefix=CHECK-HOST %s +// RUN: %clang_cc1 -cxx-abi itanium -emit-llvm %s -o - -fcuda-is-device | FileCheck -check-prefix=CHECK-DEVICE %s #include "../SemaCUDA/cuda.h" diff --git a/test/CodeGenCXX/instr-profile.cpp b/test/CodeGenCXX/instr-profile.cpp index 266c921456..6e332686b6 100644 --- a/test/CodeGenCXX/instr-profile.cpp +++ b/test/CodeGenCXX/instr-profile.cpp @@ -7,11 +7,11 @@ // FIXME: Don't seek bb labels, like "if.else" // REQUIRES: asserts -// RUN: %clangxx %s -o - -emit-llvm -S -fprofile-instr-generate | FileCheck -check-prefix=PGOGEN %s -// RUN: %clangxx %s -o - -emit-llvm -S -fprofile-instr-generate | FileCheck -check-prefix=PGOGEN-EXC %s +// RUN: %clangxx %s -o - -emit-llvm -S -fprofile-instr-generate -Xclang -cxx-abi -Xclang itanium | FileCheck -check-prefix=PGOGEN %s +// RUN: %clangxx %s -o - -emit-llvm -S -fprofile-instr-generate -Xclang -cxx-abi -Xclang itanium | FileCheck -check-prefix=PGOGEN-EXC %s -// RUN: %clang %s -o - -emit-llvm -S -fprofile-instr-use=%S/Inputs/instr-profile.pgodata | FileCheck -check-prefix=PGOUSE %s -// RUN: %clang %s -o - -emit-llvm -S -fprofile-instr-use=%S/Inputs/instr-profile.pgodata | FileCheck -check-prefix=PGOUSE-EXC %s +// RUN: %clang %s -o - -emit-llvm -S -fprofile-instr-use=%S/Inputs/instr-profile.pgodata -Xclang -cxx-abi -Xclang itanium | FileCheck -check-prefix=PGOUSE %s +// RUN: %clang %s -o - -emit-llvm -S -fprofile-instr-use=%S/Inputs/instr-profile.pgodata -Xclang -cxx-abi -Xclang itanium | FileCheck -check-prefix=PGOUSE-EXC %s // PGOGEN: @[[THC:__llvm_pgo_ctr[0-9]*]] = private global [11 x i64] zeroinitializer // PGOGEN-EXC: @[[THC:__llvm_pgo_ctr[0-9]*]] = private global [11 x i64] zeroinitializer diff --git a/test/CodeGenObjC/debug-info-self.m b/test/CodeGenObjC/debug-info-self.m index 8cbc0292f0..5bb1a8a3a6 100644 --- a/test/CodeGenObjC/debug-info-self.m +++ b/test/CodeGenObjC/debug-info-self.m @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -emit-llvm -g %s -o - | FileCheck %s +// RUN: %clang_cc1 -emit-llvm -cxx-abi itanium -g %s -o - | FileCheck %s // self and _cmd are marked as DW_AT_artificial. // myarg is not marked as DW_AT_artificial. diff --git a/test/CodeGenObjC/overloadable.m b/test/CodeGenObjC/overloadable.m index 4fd1429f28..9c462b71ab 100644 --- a/test/CodeGenObjC/overloadable.m +++ b/test/CodeGenObjC/overloadable.m @@ -1,10 +1,12 @@ // rdar://6657613 -// RUN: %clang_cc1 -emit-llvm %s -o %t +// RUN: %clang_cc1 -cxx-abi itanium -emit-llvm %s -o - | FileCheck %s @class C; -// RUN: grep _Z1fP11objc_object %t | count 1 +// CHECK: _Z1fP11objc_object +// CHECK-NOT: _Z1fP11objc_object void __attribute__((overloadable)) f(id c) { } -// RUN: grep _Z1fP1C %t | count 1 +// CHECK: _Z1fP1C +// CHECK-NOT: _Z1fP1C void __attribute__((overloadable)) f(C *c) { } diff --git a/test/CodeGenObjCXX/arc-mangle.mm b/test/CodeGenObjCXX/arc-mangle.mm index 10c4f68451..005f8f8ff0 100644 --- a/test/CodeGenObjCXX/arc-mangle.mm +++ b/test/CodeGenObjCXX/arc-mangle.mm @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -fobjc-arc -fobjc-runtime-has-weak -emit-llvm -o - %s | FileCheck %s +// RUN: %clang_cc1 -fobjc-arc -fobjc-runtime-has-weak -cxx-abi itanium -emit-llvm -o - %s | FileCheck %s // CHECK-LABEL: define void @_Z1fPU8__strongP11objc_object(i8**) void f(__strong id *) {} diff --git a/test/CodeGenOpenCL/address-spaces-mangling.cl b/test/CodeGenOpenCL/address-spaces-mangling.cl index 3c7a518363..8d9a15f680 100644 --- a/test/CodeGenOpenCL/address-spaces-mangling.cl +++ b/test/CodeGenOpenCL/address-spaces-mangling.cl @@ -1,5 +1,5 @@ -// RUN: %clang_cc1 %s -ffake-address-space-map -faddress-space-map-mangling=yes -emit-llvm -o - | FileCheck -check-prefix=ASMANG %s -// RUN: %clang_cc1 %s -ffake-address-space-map -faddress-space-map-mangling=no -emit-llvm -o - | FileCheck -check-prefix=NOASMANG %s +// RUN: %clang_cc1 %s -ffake-address-space-map -faddress-space-map-mangling=yes -cxx-abi itanium -emit-llvm -o - | FileCheck -check-prefix=ASMANG %s +// RUN: %clang_cc1 %s -ffake-address-space-map -faddress-space-map-mangling=no -cxx-abi itanium -emit-llvm -o - | FileCheck -check-prefix=NOASMANG %s // We can't name this f as private is equivalent to default // no specifier given address space so we get multiple definition diff --git a/test/CodeGenOpenCL/local.cl b/test/CodeGenOpenCL/local.cl index b5c67d9af9..bc31e52311 100644 --- a/test/CodeGenOpenCL/local.cl +++ b/test/CodeGenOpenCL/local.cl @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 %s -ffake-address-space-map -faddress-space-map-mangling=no -emit-llvm -o - | FileCheck %s +// RUN: %clang_cc1 %s -ffake-address-space-map -faddress-space-map-mangling=no -cxx-abi itanium -emit-llvm -o - | FileCheck %s __kernel void foo(void) { // CHECK: @foo.i = internal addrspace(2) diff --git a/test/PCH/cxx-reference.cpp b/test/PCH/cxx-reference.cpp index a1a44e6893..a22f9aca00 100644 --- a/test/PCH/cxx-reference.cpp +++ b/test/PCH/cxx-reference.cpp @@ -1,6 +1,6 @@ // Test this without pch. -// RUN: %clang_cc1 -x c++ -std=c++11 -include %S/cxx-reference.h -fsyntax-only -emit-llvm -o - %s +// RUN: %clang_cc1 -x c++ -cxx-abi itanium -std=c++11 -include %S/cxx-reference.h -fsyntax-only -emit-llvm -o - %s // Test with pch. -// RUN: %clang_cc1 -x c++ -std=c++11 -emit-pch -o %t %S/cxx-reference.h -// RUN: %clang_cc1 -x c++ -std=c++11 -include-pch %t -fsyntax-only -emit-llvm -o - %s +// RUN: %clang_cc1 -x c++ -cxx-abi itanium -std=c++11 -emit-pch -o %t %S/cxx-reference.h +// RUN: %clang_cc1 -x c++ -cxx-abi itanium -std=c++11 -include-pch %t -fsyntax-only -emit-llvm -o - %s diff --git a/test/PCH/cxx-required-decls.cpp b/test/PCH/cxx-required-decls.cpp index 8c4b11cd84..f98ce43b28 100644 --- a/test/PCH/cxx-required-decls.cpp +++ b/test/PCH/cxx-required-decls.cpp @@ -1,9 +1,9 @@ // Test this without pch. -// RUN: %clang_cc1 -include %S/cxx-required-decls.h %s -emit-llvm -o - | FileCheck %s +// RUN: %clang_cc1 -include %S/cxx-required-decls.h %s -cxx-abi itanium -emit-llvm -o - | FileCheck %s // Test with pch. -// RUN: %clang_cc1 -x c++-header -emit-pch -o %t %S/cxx-required-decls.h -// RUN: %clang_cc1 -include-pch %t %s -emit-llvm -o - | FileCheck %s +// RUN: %clang_cc1 -x c++-header -cxx-abi itanium -emit-pch -o %t %S/cxx-required-decls.h +// RUN: %clang_cc1 -include-pch %t %s -cxx-abi itanium -emit-llvm -o - | FileCheck %s // CHECK: @_ZL5globS = internal global %struct.S zeroinitializer // CHECK: @_ZL3bar = internal global i32 0, align 4 diff --git a/test/PCH/cxx-templates.cpp b/test/PCH/cxx-templates.cpp index 966ffaa5df..6cad26e49b 100644 --- a/test/PCH/cxx-templates.cpp +++ b/test/PCH/cxx-templates.cpp @@ -1,21 +1,21 @@ // Test this without pch. -// RUN: %clang_cc1 -std=c++11 -fcxx-exceptions -fexceptions -include %S/cxx-templates.h -verify %s -ast-dump -o - -// RUN: %clang_cc1 -std=c++11 -fcxx-exceptions -fexceptions -include %S/cxx-templates.h %s -emit-llvm -o - -DNO_ERRORS | FileCheck %s +// RUN: %clang_cc1 -std=c++11 -cxx-abi itanium -fcxx-exceptions -fexceptions -include %S/cxx-templates.h -verify %s -ast-dump -o - +// RUN: %clang_cc1 -std=c++11 -cxx-abi itanium -fcxx-exceptions -fexceptions -include %S/cxx-templates.h %s -emit-llvm -o - -DNO_ERRORS | FileCheck %s // Test with pch. -// RUN: %clang_cc1 -std=c++11 -fcxx-exceptions -fexceptions -x c++-header -emit-pch -o %t %S/cxx-templates.h -// RUN: %clang_cc1 -std=c++11 -fcxx-exceptions -fexceptions -include-pch %t -verify %s -ast-dump -o - -// RUN: %clang_cc1 -std=c++11 -fcxx-exceptions -fexceptions -include-pch %t %s -emit-llvm -o - -error-on-deserialized-decl doNotDeserialize -DNO_ERRORS | FileCheck %s +// RUN: %clang_cc1 -std=c++11 -cxx-abi itanium -fcxx-exceptions -fexceptions -x c++-header -emit-pch -o %t %S/cxx-templates.h +// RUN: %clang_cc1 -std=c++11 -cxx-abi itanium -fcxx-exceptions -fexceptions -include-pch %t -verify %s -ast-dump -o - +// RUN: %clang_cc1 -std=c++11 -cxx-abi itanium -fcxx-exceptions -fexceptions -include-pch %t %s -emit-llvm -o - -error-on-deserialized-decl doNotDeserialize -DNO_ERRORS | FileCheck %s // Test with modules. -// RUN: %clang_cc1 -std=c++11 -fcxx-exceptions -fexceptions -fmodules -x c++-header -emit-pch -o %t %S/cxx-templates.h -// RUN: %clang_cc1 -std=c++11 -fcxx-exceptions -fexceptions -fmodules -include-pch %t -verify %s -ast-dump -o - -// RUN: %clang_cc1 -std=c++11 -fcxx-exceptions -fexceptions -fmodules -include-pch %t %s -emit-llvm -o - -error-on-deserialized-decl doNotDeserialize -DNO_ERRORS | FileCheck %s +// RUN: %clang_cc1 -std=c++11 -cxx-abi itanium -fcxx-exceptions -fexceptions -fmodules -x c++-header -emit-pch -o %t %S/cxx-templates.h +// RUN: %clang_cc1 -std=c++11 -cxx-abi itanium -fcxx-exceptions -fexceptions -fmodules -include-pch %t -verify %s -ast-dump -o - +// RUN: %clang_cc1 -std=c++11 -cxx-abi itanium -fcxx-exceptions -fexceptions -fmodules -include-pch %t %s -emit-llvm -o - -error-on-deserialized-decl doNotDeserialize -DNO_ERRORS | FileCheck %s // Test with pch and delayed template parsing. -// RUN: %clang_cc1 -std=c++11 -fcxx-exceptions -fdelayed-template-parsing -fexceptions -x c++-header -emit-pch -o %t %S/cxx-templates.h -// RUN: %clang_cc1 -std=c++11 -fcxx-exceptions -fdelayed-template-parsing -fexceptions -include-pch %t -verify %s -ast-dump -o - -// RUN: %clang_cc1 -std=c++11 -fcxx-exceptions -fdelayed-template-parsing -fexceptions -include-pch %t %s -emit-llvm -o - -DNO_ERRORS | FileCheck %s +// RUN: %clang_cc1 -std=c++11 -cxx-abi itanium -fcxx-exceptions -fdelayed-template-parsing -fexceptions -x c++-header -emit-pch -o %t %S/cxx-templates.h +// RUN: %clang_cc1 -std=c++11 -cxx-abi itanium -fcxx-exceptions -fdelayed-template-parsing -fexceptions -include-pch %t -verify %s -ast-dump -o - +// RUN: %clang_cc1 -std=c++11 -cxx-abi itanium -fcxx-exceptions -fdelayed-template-parsing -fexceptions -include-pch %t %s -emit-llvm -o - -DNO_ERRORS | FileCheck %s // CHECK: define weak_odr {{.*}}void @_ZN2S4IiE1mEv // CHECK: define linkonce_odr {{.*}}void @_ZN2S3IiE1mEv diff --git a/test/PCH/irgen-rdar13114142.mm b/test/PCH/irgen-rdar13114142.mm index 7a9cfba942..f3c3f099e2 100644 --- a/test/PCH/irgen-rdar13114142.mm +++ b/test/PCH/irgen-rdar13114142.mm @@ -1,5 +1,5 @@ -// RUN: %clang_cc1 %s -emit-pch -o %t.pch -// RUN: %clang_cc1 %s -emit-llvm -include-pch %t.pch -o - | FileCheck %s +// RUN: %clang_cc1 %s -cxx-abi itanium -emit-pch -o %t.pch +// RUN: %clang_cc1 %s -cxx-abi itanium -emit-llvm -include-pch %t.pch -o - | FileCheck %s #ifndef HEADER #define HEADER diff --git a/test/PCH/objc_literals.mm b/test/PCH/objc_literals.mm index 59f33815a2..84d9ebafe8 100644 --- a/test/PCH/objc_literals.mm +++ b/test/PCH/objc_literals.mm @@ -1,7 +1,7 @@ -// RUN: %clang_cc1 -emit-pch -x objective-c++ -std=c++0x -o %t %s -// RUN: %clang_cc1 -include-pch %t -x objective-c++ -std=c++0x -verify %s -// RUN: %clang_cc1 -include-pch %t -x objective-c++ -std=c++0x -ast-print %s | FileCheck -check-prefix=CHECK-PRINT %s -// RUN: %clang_cc1 -include-pch %t -x objective-c++ -std=c++0x -emit-llvm -o - %s | FileCheck -check-prefix=CHECK-IR %s +// RUN: %clang_cc1 -cxx-abi itanium -emit-pch -x objective-c++ -std=c++0x -o %t %s +// RUN: %clang_cc1 -cxx-abi itanium -include-pch %t -x objective-c++ -std=c++0x -verify %s +// RUN: %clang_cc1 -cxx-abi itanium -include-pch %t -x objective-c++ -std=c++0x -ast-print %s | FileCheck -check-prefix=CHECK-PRINT %s +// RUN: %clang_cc1 -cxx-abi itanium -include-pch %t -x objective-c++ -std=c++0x -emit-llvm -o - %s | FileCheck -check-prefix=CHECK-IR %s // expected-no-diagnostics diff --git a/test/PCH/objcxx-ivar-class.mm b/test/PCH/objcxx-ivar-class.mm index 0ed4cc6ec9..e0d01e94d5 100644 --- a/test/PCH/objcxx-ivar-class.mm +++ b/test/PCH/objcxx-ivar-class.mm @@ -1,9 +1,9 @@ // Test this without pch. -// RUN: not %clang_cc1 -include %S/objcxx-ivar-class.h -verify %s -emit-llvm -o - | FileCheck %s +// RUN: %clang_cc1 -include %S/objcxx-ivar-class.h -cxx-abi itanium %s -emit-llvm -o - | FileCheck %s // Test with pch. -// RUN: %clang_cc1 -x objective-c++-header -emit-pch -o %t %S/objcxx-ivar-class.h -// RUN: not %clang_cc1 -include-pch %t -verify %s -emit-llvm -o - | FileCheck %s +// RUN: %clang_cc1 -x objective-c++-header -cxx-abi itanium -emit-pch -o %t %S/objcxx-ivar-class.h +// RUN: %clang_cc1 -include-pch %t -cxx-abi itanium %s -emit-llvm -o - | FileCheck %s // CHECK: [C position] // CHECK: call {{.*}} @_ZN1SC1ERKS_ diff --git a/test/Sema/empty1.c b/test/Sema/empty1.c index de922f775e..115f9381bc 100644 --- a/test/Sema/empty1.c +++ b/test/Sema/empty1.c @@ -1,4 +1,7 @@ -// RUN: %clang_cc1 %s -fsyntax-only -verify -Wc++-compat +// RUN: %clang_cc1 %s -cxx-abi itanium -fsyntax-only -verify -Wc++-compat + +// FIXME: Empty C structs are 4 bytes in MSVC, but the -cxx-abi flag probably +// shouldn't affect this since it's not C++. PR18263. struct emp_1 { // expected-warning {{empty struct has size 0 in C, size 1 in C++}} }; diff --git a/test/SemaCXX/deleted-operator.cpp b/test/SemaCXX/deleted-operator.cpp index 9f53e71d45..df67978a36 100644 --- a/test/SemaCXX/deleted-operator.cpp +++ b/test/SemaCXX/deleted-operator.cpp @@ -13,6 +13,7 @@ int PR10757f() { } struct DelOpDel { - virtual ~DelOpDel() {} // expected-error {{deleted function}} - void operator delete(void*) = delete; // expected-note {{deleted here}} + // FIXME: In MS ABI, we error twice below. + virtual ~DelOpDel() {} // expected-error 1-2 {{attempt to use a deleted function}} + void operator delete(void*) = delete; // expected-note 1-2 {{deleted here}} }; diff --git a/test/SemaCXX/destructor.cpp b/test/SemaCXX/destructor.cpp index e511be0116..bd22ff640d 100644 --- a/test/SemaCXX/destructor.cpp +++ b/test/SemaCXX/destructor.cpp @@ -1,4 +1,5 @@ -// RUN: %clang_cc1 -std=c++11 -fsyntax-only -Wnon-virtual-dtor -Wdelete-non-virtual-dtor -verify %s +// RUN: %clang_cc1 -std=c++11 -cxx-abi itanium -fsyntax-only -Wnon-virtual-dtor -Wdelete-non-virtual-dtor -verify %s +// RUN: %clang_cc1 -std=c++11 -cxx-abi microsoft -DMSABI -fsyntax-only -Wnon-virtual-dtor -Wdelete-non-virtual-dtor -verify %s class A { public: ~A(); @@ -83,6 +84,12 @@ namespace PR6421 { } namespace PR6709 { +#ifdef MSABI + // This bug, "Clang instantiates destructor for function argument" is intended + // behaviour in the Microsoft ABI because the callee needs to destruct the arguments. + // expected-error@+3 {{indirection requires pointer operand ('int' invalid)}} + // expected-note@+3 {{in instantiation of member function 'PR6709::X::~X' requested here}} +#endif template class X { T v; ~X() { ++*v; } }; void a(X x) {} } @@ -100,10 +107,16 @@ namespace test6 { T::deleteIt(p); // expected-error {{type 'int' cannot be used prior to '::'}} } +#ifdef MSABI + // expected-note@+2 {{in instantiation of member function 'test6::A::operator delete' requested here}} +#endif virtual ~A() {} }; - class B : A { B(); }; // expected-note {{in instantiation of member function 'test6::A::operator delete' requested here}} +#ifndef MSABI + // expected-note@+2 {{in instantiation of member function 'test6::A::operator delete' requested here}} +#endif + class B : A { B(); }; B::B() {} } diff --git a/test/SemaCXX/implicit-virtual-member-functions.cpp b/test/SemaCXX/implicit-virtual-member-functions.cpp index cd547f5764..e3040c3a6d 100644 --- a/test/SemaCXX/implicit-virtual-member-functions.cpp +++ b/test/SemaCXX/implicit-virtual-member-functions.cpp @@ -1,4 +1,5 @@ -// RUN: %clang_cc1 -fsyntax-only -verify %s +// RUN: %clang_cc1 -fsyntax-only -cxx-abi itanium -verify %s +// RUN: %clang_cc1 -fsyntax-only -cxx-abi microsoft -DMSABI -verify %s struct A { virtual ~A(); }; @@ -9,8 +10,12 @@ struct B : A { // expected-error {{no suitable member 'operator delete' in 'B'}} void operator delete (void *, int); // expected-note {{'operator delete' declared here}} }; +#ifdef MSABI +B b; // expected-note {{implicit destructor for 'B' first required here}} +#else void B::f() { // expected-note {{implicit destructor for 'B' first required here}} } +#endif struct C : A { // expected-error {{no suitable member 'operator delete' in 'C'}} C(); @@ -26,4 +31,3 @@ struct D : A { // expected-error {{no suitable member 'operator delete' in 'D'}} void f() { new D; // expected-note {{implicit destructor for 'D' first required here}} } - diff --git a/test/SemaCXX/primary-base.cpp b/test/SemaCXX/primary-base.cpp index 0b6aaef493..220e93fe60 100644 --- a/test/SemaCXX/primary-base.cpp +++ b/test/SemaCXX/primary-base.cpp @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -fsyntax-only -verify %s +// RUN: %clang_cc1 -cxx-abi itanium -fsyntax-only -verify %s // expected-no-diagnostics class A { virtual void f(); }; class B : virtual A { }; diff --git a/test/SemaCXX/typeid-ref.cpp b/test/SemaCXX/typeid-ref.cpp index d01fd31685..5b7754fa76 100644 --- a/test/SemaCXX/typeid-ref.cpp +++ b/test/SemaCXX/typeid-ref.cpp @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -emit-llvm -o - %s | FileCheck %s +// RUN: %clang_cc1 -cxx-abi itanium -emit-llvm -o - %s | FileCheck %s namespace std { class type_info; } diff --git a/test/SemaCXX/undefined-internal.cpp b/test/SemaCXX/undefined-internal.cpp index 1b76a86dcb..894201709e 100644 --- a/test/SemaCXX/undefined-internal.cpp +++ b/test/SemaCXX/undefined-internal.cpp @@ -1,7 +1,10 @@ // RUN: %clang_cc1 -fsyntax-only -verify %s // Make sure we don't produce invalid IR. -// RUN: %clang_cc1 -emit-llvm-only %s +// RUN: %clang_cc1 -cxx-abi itanium -emit-llvm-only %s + +// FIXME: -cxx-abi itanium shouldn't be necessary; the test should pass +// in MS mode too. namespace test1 { static void foo(); // expected-warning {{function 'test1::foo' has internal linkage but is not defined}} diff --git a/test/SemaCXX/virtual-base-used.cpp b/test/SemaCXX/virtual-base-used.cpp index 04518ce4d4..c2ff06b73a 100644 --- a/test/SemaCXX/virtual-base-used.cpp +++ b/test/SemaCXX/virtual-base-used.cpp @@ -1,42 +1,89 @@ -// RUN: %clang_cc1 -fsyntax-only -verify %s +// RUN: %clang_cc1 -fsyntax-only -cxx-abi itanium -verify %s +// RUN: %clang_cc1 -fsyntax-only -cxx-abi microsoft -DMSABI -verify %s // PR7800 +// The Microsoft ABI doesn't have the concept of key functions, so we have different +// expectations about when functions are first required for that case. + +#ifdef MSABI +// expected-note@+2 3 {{declared private here}} +#endif class NoDestroy { ~NoDestroy(); }; // expected-note 3 {{declared private here}} struct A { virtual ~A(); }; +#ifdef MSABI +// expected-error@+3 {{field of type 'NoDestroy' has private destructor}} +#endif struct B : public virtual A { NoDestroy x; // expected-error {{field of type 'NoDestroy' has private destructor}} }; +#ifdef MSABI +// expected-note@+3 {{implicit default constructor for 'B' first required here}} +// expected-note@+2 {{implicit destructor for 'B' first required here}} +#endif struct D : public virtual B { virtual void foo(); ~D(); }; +#ifdef MSABI +D d; // expected-note {{implicit default constructor for 'D' first required here}} +#else void D::foo() { // expected-note {{implicit destructor for 'B' first required here}} } +#endif +#ifdef MSABI +// expected-error@+3 {{field of type 'NoDestroy' has private destructor}} +#endif struct E : public virtual A { NoDestroy x; // expected-error {{field of type 'NoDestroy' has private destructor}} }; +#ifdef MSABI +// expected-note@+2 {{implicit default constructor for 'E' first required here}} +#endif struct F : public E { // expected-note {{implicit destructor for 'E' first required here}} }; +#ifdef MSABI +// expected-note@+2 {{implicit default constructor for 'F' first required here}} +#endif struct G : public virtual F { virtual void foo(); ~G(); }; +#ifdef MSABI +G g; // expected-note {{implicit default constructor for 'G' first required here}} +#else void G::foo() { // expected-note {{implicit destructor for 'F' first required here}} } +#endif +#ifdef MSABI +// expected-note@+3 {{'H' declared here}} +// expected-error@+3 {{field of type 'NoDestroy' has private destructor}} +#endif struct H : public virtual A { NoDestroy x; // expected-error {{field of type 'NoDestroy' has private destructor}} }; +#ifdef MSABI +// expected-error@+3 {{implicit default constructor for 'I' must explicitly initialize the base class 'H' which does not have a default constructor}} +// expected-note@+2 {{implicit destructor for 'H' first required here}} +#endif struct I : public virtual H { ~I(); }; +#ifdef MSABI +// expected-note@+3 {{implicit default constructor for 'H' first required here}} +// expected-note@+2 {{implicit default constructor for 'I' first required here}} +#endif struct J : public I { virtual void foo(); ~J(); }; +#ifdef MSABI +J j; // expected-note {{implicit default constructor for 'J' first required here}} +#else void J::foo() { // expected-note {{implicit destructor for 'H' first required here}} } +#endif diff --git a/test/SemaCXX/warn-reinterpret-base-class.cpp b/test/SemaCXX/warn-reinterpret-base-class.cpp index 36b8fda553..f7d5bc551f 100644 --- a/test/SemaCXX/warn-reinterpret-base-class.cpp +++ b/test/SemaCXX/warn-reinterpret-base-class.cpp @@ -1,5 +1,8 @@ -// RUN: %clang_cc1 -std=c++11 -fsyntax-only -verify -Wreinterpret-base-class -Wno-unused-volatile-lvalue %s -// RUN: not %clang_cc1 -std=c++11 -fsyntax-only -fdiagnostics-parseable-fixits -Wreinterpret-base-class -Wno-unused-volatile-lvalue %s 2>&1 | FileCheck %s +// RUN: %clang_cc1 -std=c++11 -fsyntax-only -cxx-abi itanium -verify -Wreinterpret-base-class -Wno-unused-volatile-lvalue %s +// RUN: %clang_cc1 -std=c++11 -fsyntax-only -cxx-abi microsoft -DMSABI -verify -Wreinterpret-base-class -Wno-unused-volatile-lvalue %s + +// RUN: not %clang_cc1 -std=c++11 -fsyntax-only -cxx-abi itanium -fdiagnostics-parseable-fixits -Wreinterpret-base-class -Wno-unused-volatile-lvalue %s 2>&1 | FileCheck %s +// RUN: not %clang_cc1 -std=c++11 -fsyntax-only -cxx-abi microsoft -fdiagnostics-parseable-fixits -Wreinterpret-base-class -Wno-unused-volatile-lvalue %s 2>&1 | FileCheck %s // PR 13824 class A { @@ -288,6 +291,11 @@ void different_subobject_downcast(E *e, F *f, A *a) { (void)reinterpret_cast(f); // CHECK: fix-it:"{{.*}}":{[[@LINE-1]]:9-[[@LINE-1]]:25}:"static_cast" +#ifdef MSABI + // In MS ABI mode, A is at non-zero offset in H. + // expected-warning@+3 {{'reinterpret_cast' to class 'H *' from its base at non-zero offset 'A *' behaves differently from 'static_cast'}} + // expected-note@+2 {{use 'static_cast'}} +#endif (void)reinterpret_cast(a); // expected-warning@+2 {{'reinterpret_cast' to class 'L' (aka 'const F *volatile') from its base at non-zero offset 'E *' behaves differently from 'static_cast'}} @@ -309,6 +317,12 @@ void different_subobject_upcast(F *f, G *g, H *h, I *i) { // CHECK: fix-it:"{{.*}}":{[[@LINE-1]]:9-[[@LINE-1]]:25}:"static_cast" (void)reinterpret_cast(h); + +#ifdef MSABI + // In MS ABI mode, A is at non-zero offset in H. + // expected-warning@+3 {{'reinterpret_cast' from class 'H *' to its base at non-zero offset 'A *' behaves differently from 'static_cast'}} + // expected-note@+2 {{use 'static_cast'}} +#endif (void)reinterpret_cast(h); // expected-warning@+2 {{'reinterpret_cast' from class 'I *' to its virtual base 'F *' behaves differently from 'static_cast'}} diff --git a/test/SemaCXX/warn-weak-vtables.cpp b/test/SemaCXX/warn-weak-vtables.cpp index 135e034259..c49bbc015f 100644 --- a/test/SemaCXX/warn-weak-vtables.cpp +++ b/test/SemaCXX/warn-weak-vtables.cpp @@ -1,4 +1,5 @@ -// RUN: %clang_cc1 %s -fsyntax-only -verify -Wweak-vtables -Wweak-template-vtables +// RUN: %clang_cc1 %s -fsyntax-only -verify -cxx-abi itanium -Wweak-vtables -Wweak-template-vtables +// RUN: %clang_cc1 %s -fsyntax-only -cxx-abi microsoft -Werror -Wno-weak-vtables -Wno-weak-template-vtables struct A { // expected-warning {{'A' has no out-of-line virtual method definitions; its vtable will be emitted in every translation unit}} virtual void f() { } diff --git a/test/SemaTemplate/inject-templated-friend-post.cpp b/test/SemaTemplate/inject-templated-friend-post.cpp index c86f718bb5..b0aca681aa 100644 --- a/test/SemaTemplate/inject-templated-friend-post.cpp +++ b/test/SemaTemplate/inject-templated-friend-post.cpp @@ -1,12 +1,17 @@ -// RUN: %clang %s -std=c++98 -S -emit-llvm -o - | grep -e "define linkonce_odr.*_ZlsR11std_ostreamRK8StreamerI3FooE" -// RUN: %clang %s -std=c++98 -S -emit-llvm -o - -DPROTOTYPE | grep -e "define linkonce_odr.*_ZlsR11std_ostreamRK8StreamerI3FooE" -// RUN: %clang %s -std=c++98 -S -emit-llvm -o - -DINSTANTIATE | grep -e "define linkonce_odr.*_ZlsR11std_ostreamRK8StreamerI3FooE" -// RUN: %clang %s -std=c++98 -S -emit-llvm -o - -DPROTOTYPE -DINSTANTIATE | grep -e "define linkonce_odr.*_ZlsR11std_ostreamRK8StreamerI3FooE" +// RUN: %clang_cc1 %s -std=c++98 -cxx-abi itanium -emit-llvm -o - | FileCheck %s +// RUN: %clang_cc1 %s -std=c++98 -cxx-abi itanium -emit-llvm -o - -DPROTOTYPE | FileCheck --check-prefix=CHECK-PROTOTYPE %s +// RUN: %clang_cc1 %s -std=c++98 -cxx-abi itanium -emit-llvm -o - -DINSTANTIATE | FileCheck --check-prefix=CHECK-INSTANTIATE %s +// RUN: %clang_cc1 %s -std=c++98 -cxx-abi itanium -emit-llvm -o - -DPROTOTYPE -DINSTANTIATE | FileCheck --check-prefix=CHECK-PROTOTYPE-INSTANTIATE %s // RUN: %clang_cc1 %s -DREDEFINE -verify // RUN: %clang_cc1 %s -DPROTOTYPE -DREDEFINE -verify // PR8007: friend function not instantiated, reordered version. // Corresponds to http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38392 +// CHECK: define linkonce_odr{{.*}}_ZlsR11std_ostreamRK8StreamerI3FooE +// CHECK-PROTOTYPE: define linkonce_odr{{.*}}_ZlsR11std_ostreamRK8StreamerI3FooE +// CHECK-INSTANTIATE: define linkonce_odr{{.*}}_ZlsR11std_ostreamRK8StreamerI3FooE +// CHECK-PROTOTYPE-INSTANTIATE: define linkonce_odr{{.*}}_ZlsR11std_ostreamRK8StreamerI3FooE + struct std_ostream { int dummy; diff --git a/test/SemaTemplate/inject-templated-friend.cpp b/test/SemaTemplate/inject-templated-friend.cpp index 7be613b6d3..037d66754d 100644 --- a/test/SemaTemplate/inject-templated-friend.cpp +++ b/test/SemaTemplate/inject-templated-friend.cpp @@ -1,7 +1,9 @@ -// RUN: %clang %s -S -emit-llvm -o - | grep -e "define linkonce_odr.*_ZlsR11std_ostreamRK8StreamerI3FooE" +// RUN: %clang_cc1 %s -emit-llvm -cxx-abi itanium -o - | FileCheck %s // RUN: %clang_cc1 %s -DREDEFINE -verify // PR8007: friend function not instantiated. +// CHECK: define linkonce_odr{{.*}}_ZlsR11std_ostreamRK8StreamerI3FooE + struct std_ostream { int dummy; diff --git a/test/SemaTemplate/instantiate-complete.cpp b/test/SemaTemplate/instantiate-complete.cpp index 68d5ae3cfb..0e169b9b39 100644 --- a/test/SemaTemplate/instantiate-complete.cpp +++ b/test/SemaTemplate/instantiate-complete.cpp @@ -1,4 +1,5 @@ -// RUN: %clang_cc1 -fsyntax-only -verify %s +// RUN: %clang_cc1 -cxx-abi itanium -fsyntax-only -verify %s +// RUN: %clang_cc1 -cxx-abi microsoft -DMSABI -fsyntax-only -verify %s // Tests various places where requiring a complete type involves // instantiation of that type. @@ -7,6 +8,9 @@ template struct X { X(T); +#ifdef MSABI +// expected-error@+2{{data member instantiated with function type 'long (long)'}} +#endif T f; // expected-error{{data member instantiated with function type 'float (int)'}} \ // expected-error{{data member instantiated with function type 'int (int)'}} \ // expected-error{{data member instantiated with function type 'char (char)'}} \ @@ -40,7 +44,11 @@ void test_new() { void test_memptr(X *p1, long X::*pm1, X *p2, +#ifdef MSABI + long (X::*pm2)(long)) { // expected-note{{in instantiation of template class 'X' requested here}} +#else long (X::*pm2)(long)) { +#endif (void)(p1->*pm1); } diff --git a/test/SemaTemplate/instantiate-exception-spec-cxx11.cpp b/test/SemaTemplate/instantiate-exception-spec-cxx11.cpp index 5f43ea2c27..59a0a604a4 100644 --- a/test/SemaTemplate/instantiate-exception-spec-cxx11.cpp +++ b/test/SemaTemplate/instantiate-exception-spec-cxx11.cpp @@ -1,8 +1,11 @@ -// RUN: %clang_cc1 -fsyntax-only -verify -std=c++11 -ftemplate-depth 16 -fcxx-exceptions -fexceptions %s +// RUN: %clang_cc1 -fsyntax-only -verify -cxx-abi itanium -std=c++11 -ftemplate-depth 16 -fcxx-exceptions -fexceptions %s // DR1330: an exception specification for a function template is only // instantiated when it is needed. +// Note: the test is Itanium-specific because it depends on key functions in the +// PR12763 namespace. + template void f1(T*) throw(T); // expected-error{{incomplete type 'Incomplete' is not allowed in exception specification}} struct Incomplete; // expected-note{{forward}} diff --git a/test/SemaTemplate/virtual-member-functions.cpp b/test/SemaTemplate/virtual-member-functions.cpp index 439d8f836f..005cd580f4 100644 --- a/test/SemaTemplate/virtual-member-functions.cpp +++ b/test/SemaTemplate/virtual-member-functions.cpp @@ -1,4 +1,5 @@ -// RUN: %clang_cc1 -fsyntax-only -verify %s +// RUN: %clang_cc1 -cxx-abi itanium -fsyntax-only -verify %s +// RUN: %clang_cc1 -cxx-abi microsoft -DMSABI -fsyntax-only -verify %s namespace PR5557 { template struct A { @@ -71,8 +72,13 @@ namespace PR7114 { int f() { return B::value; } +#ifdef MSABI + void test_typeid(B::Inner bfi) { // expected-note{{implicit destructor}} + (void)typeid(bfi); +#else void test_typeid(B::Inner bfi) { (void)typeid(bfi); // expected-note{{implicit destructor}} +#endif } template @@ -80,7 +86,7 @@ namespace PR7114 { void f() { } }; - void test_X(X xi, X xf) { + void test_X(X &xi, X &xf) { xi.f(); } } -- 2.40.0