[cfe-commits] r151442 - in /cfe/trunk: lib/Sema/SemaExprCXX.cpp test/SemaCXX/deleted-operator.cpp

[Richard Smith]

Author: rsmith
Date: Sat Feb 25 03:42:26 2012
New Revision: 151442

URL: http://llvm.org/viewvc/llvm-project?rev=151442&view=rev
Log:
Fix assertion (too few Diag arguments) when diagnosing a deleted operator delete

Modified:
    cfe/trunk/lib/Sema/SemaExprCXX.cpp
    cfe/trunk/test/SemaCXX/deleted-operator.cpp

Modified: cfe/trunk/lib/Sema/SemaExprCXX.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExprCXX.cpp?rev=151442&r1=151441&r2=151442&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaExprCXX.cpp (original)
+++ cfe/trunk/lib/Sema/SemaExprCXX.cpp Sat Feb 25 03:42:26 2012
@@ -1881,7 +1881,8 @@
     if (Operator->isDeleted()) {
       if (Diagnose) {
         Diag(StartLoc, diag::err_deleted_function_use);
-        Diag(Operator->getLocation(), diag::note_unavailable_here) << true;
+        Diag(Operator->getLocation(), diag::note_unavailable_here)
+          << /*function*/ 1 << /*deleted*/ 1;
       }
       return true;
     }

Modified: cfe/trunk/test/SemaCXX/deleted-operator.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/deleted-operator.cpp?rev=151442&r1=151441&r2=151442&view=diff
==============================================================================
--- cfe/trunk/test/SemaCXX/deleted-operator.cpp (original)
+++ cfe/trunk/test/SemaCXX/deleted-operator.cpp Sat Feb 25 03:42:26 2012
@@ -11,3 +11,8 @@
   if(~a1) {} // expected-error {{overload resolution selected deleted operator}} expected-note 6 {{built-in candidate}}
   if(a1==a1) {} // expected-error {{overload resolution selected deleted operator}} expected-note 81 {{built-in candidate}}
 }
+
+struct DelOpDel {
+  virtual ~DelOpDel() {} // expected-error {{deleted function}}
+  void operator delete(void*) = delete; // expected-note {{deleted here}}
+};