Diagnose ambiguity of operator delete and operator delete[]. Sebastian, please review.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@88747 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Sema/SemaExprCXX.cpp b/lib/Sema/SemaExprCXX.cpp
index 964334b20bb070498b3a71981c0e72b19882bad4..0689c6cce96f679286e9d88e9312b7994463de7b 100644 (file)
--- a/lib/Sema/SemaExprCXX.cpp
+++ b/lib/Sema/SemaExprCXX.cpp
@@ -851,8 +851,13 @@ Sema::ActOnCXXDelete(SourceLocation StartLoc, bool UseGlobal,
       // Try to find operator delete/operator delete[] in class scope.
       LookupResult Found;
       LookupQualifiedName(Found, Record, DeleteName, LookupOrdinaryName);
+      
+      if (Found.isAmbiguous()) {
+        DiagnoseAmbiguousLookup(Found, DeleteName, StartLoc);
+        return ExprError();
+      }
+      
       // FIXME: Diagnose ambiguity properly
-      assert(!Found.isAmbiguous() && "Ambiguous delete/delete[] not handled");
       for (LookupResult::iterator F = Found.begin(), FEnd = Found.end();
            F != FEnd; ++F) {
         if (CXXMethodDecl *Delete = dyn_cast<CXXMethodDecl>(*F))

diff --git a/test/SemaCXX/new-delete.cpp b/test/SemaCXX/new-delete.cpp
index fec3e2034af36f54eae9e5a1f35639bb96f265d3..63a716338ba349637094836e1f279f697b74ba36 100644 (file)
--- a/test/SemaCXX/new-delete.cpp
+++ b/test/SemaCXX/new-delete.cpp
@@ -165,3 +165,20 @@ template <class T> struct TBase {
 
 TBase<int> t1; // expected-note {{in instantiation of template class 'struct TBase<int>' requested here}}
 
+class X6 {
+public:
+  static void operator delete(void*, int); // expected-note {{member found by ambiguous name lookup}}
+};
+
+class X7 {
+public:
+  static void operator delete(void*, int); // expected-note {{member found by ambiguous name lookup}}
+};
+
+class X8 : public X6, public X7 {
+};
+
+void f(X8* x8) {
+  delete x8; // expected-error {{member 'operator delete' found in multiple base classes of different types}}
+}
+