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 964334b..0689c6c 100644
--- a/lib/Sema/SemaExprCXX.cpp
+++ b/lib/Sema/SemaExprCXX.cpp
@@ -851,8 +851,13 @@
// 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))