[Win32 ABI] Defer operator delete checks until vtable is marked used
We were previously checking at every destructor declaration, but that was a bit
excessive. Since the deleting destructor is emitted with the vtable, do the
check when the vtable is marked used.
Differential Revision: http://llvm-reviews.chandlerc.com/D2851
llvm-svn: 202046
diff --git a/clang/test/CXX/drs/dr2xx.cpp b/clang/test/CXX/drs/dr2xx.cpp
index e038e82..cf0d33d 100644
--- a/clang/test/CXX/drs/dr2xx.cpp
+++ b/clang/test/CXX/drs/dr2xx.cpp
@@ -1,10 +1,6 @@
-// RUN: %clang_cc1 -std=c++98 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors -triple %itanium_abi_triple
-// RUN: %clang_cc1 -std=c++11 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors -triple %itanium_abi_triple
-// RUN: %clang_cc1 -std=c++1y %s -verify -fexceptions -fcxx-exceptions -pedantic-errors -triple %itanium_abi_triple
-
-// RUN: %clang_cc1 -std=c++98 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors -triple %ms_abi_triple -DMSABI
-// RUN: %clang_cc1 -std=c++11 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors -triple %ms_abi_triple -DMSABI
-// RUN: %clang_cc1 -std=c++1y %s -verify -fexceptions -fcxx-exceptions -pedantic-errors -triple %ms_abi_triple -DMSABI
+// 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
// PR13819 -- __SIZE_TYPE__ is incompatible.
typedef __SIZE_TYPE__ size_t; // expected-error 0-1 {{extension}}
@@ -538,30 +534,17 @@
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();
};
@@ -577,10 +560,6 @@
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();
};
diff --git a/clang/test/CXX/special/class.dtor/p9.cpp b/clang/test/CXX/special/class.dtor/p9.cpp
index 1c70fd4..a03fcdb 100644
--- a/clang/test/CXX/special/class.dtor/p9.cpp
+++ b/clang/test/CXX/special/class.dtor/p9.cpp
@@ -29,18 +29,12 @@
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();
};
@@ -50,9 +44,6 @@
using A::operator delete;
using B::operator delete;
-#ifdef MSABI
- // expected-error@+2 {{multiple suitable 'operator delete' functions in 'C'}}
-#endif
~C();
};
@@ -62,22 +53,12 @@
// ...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'}}
diff --git a/clang/test/SemaCXX/microsoft-dtor-lookup.cpp b/clang/test/SemaCXX/microsoft-dtor-lookup.cpp
index a9f6f65..51129ae 100644
--- a/clang/test/SemaCXX/microsoft-dtor-lookup.cpp
+++ b/clang/test/SemaCXX/microsoft-dtor-lookup.cpp
@@ -1,12 +1,11 @@
// RUN: %clang_cc1 -triple %itanium_abi_triple -fsyntax-only %s
-// RUN: %clang_cc1 -triple %ms_abi_triple -verify -DMSVC_ABI %s
+// RUN: %clang_cc1 -triple %ms_abi_triple -verify %s
namespace Test1 {
// Should be accepted under the Itanium ABI (first RUN line) but rejected
// under the Microsoft ABI (second RUN line), as Microsoft ABI requires
-// operator delete() lookups to be done at all virtual destructor declaration
-// points.
+// operator delete() lookups to be done when vtables are marked used.
struct A {
void operator delete(void *); // expected-note {{member found by ambiguous name lookup}}
@@ -24,6 +23,10 @@
virtual ~VC(); // expected-error {{member 'operator delete' found in multiple base classes of different types}}
};
+void f(VC vc) {
+ // This marks VC's vtable used.
+}
+
}
namespace Test2 {