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

llvm-svn: 88747

2 files changed, 23 insertions, 1 deletions

diff --git a/clang/lib/Sema/SemaExprCXX.cpp b/clang/lib/Sema/SemaExprCXX.cpp
index 964334b20bb..0689c6cce96 100644
--- a/clang/lib/Sema/SemaExprCXX.cpp
+++ b/clang/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/clang/test/SemaCXX/new-delete.cpp b/clang/test/SemaCXX/new-delete.cpp
index fec3e2034af..63a716338ba 100644
--- a/clang/test/SemaCXX/new-delete.cpp
+++ b/clang/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}}
+}
+