Print optional message for attr(unavailable) in C++ mode.

// rdar://9046492

llvm-svn: 126499

1 files changed, 18 insertions, 5 deletions

diff --git a/clang/lib/Sema/SemaOverload.cpp b/clang/lib/Sema/SemaOverload.cpp
index c59bfec8116..1da95b6a358 100644
--- a/clang/lib/Sema/SemaOverload.cpp
+++ b/clang/lib/Sema/SemaOverload.cpp
@@ -7709,11 +7709,24 @@ Sema::BuildOverloadedCallExpr(Scope *S, Expr *Fn, UnresolvedLookupExpr *ULE,
     break;
 
   case OR_Deleted:
-    Diag(Fn->getSourceRange().getBegin(), diag::err_ovl_deleted_call)
-      << Best->Function->isDeleted()
-      << ULE->getName()
-      << Fn->getSourceRange();
-    CandidateSet.NoteCandidates(*this, OCD_AllCandidates, Args, NumArgs);
+    {
+      llvm::StringRef Message;
+      if (const UnavailableAttr *UA = 
+            Best->Function->getAttr<UnavailableAttr>()) 
+        Message = UA->getMessage();
+
+      if (Message.empty())
+        Diag(Fn->getSourceRange().getBegin(), diag::err_ovl_deleted_call)
+          << Best->Function->isDeleted()
+          << ULE->getName()
+          << Fn->getSourceRange();
+      else
+        Diag(Fn->getSourceRange().getBegin(), diag::err_ovl_unavailable_call)
+          << ULE->getName()
+          << Message
+          << Fn->getSourceRange();
+      CandidateSet.NoteCandidates(*this, OCD_AllCandidates, Args, NumArgs);
+    }
     break;
   }