Refactor the deprecated and unavailable checks into a new

DiagnoseUseOfDeprecatedDecl method.  This ensures that they
are treated consistently.  This gets us 'unavailable' support
on a few new types of decls, and makes sure we consistently
silence deprecated when the caller is also deprecated.


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

1 files changed, 8 insertions, 24 deletions

diff --git a/lib/Sema/SemaExprObjC.cpp b/lib/Sema/SemaExprObjC.cpp
index aca1cc6e80..3e99482772 100644
--- a/lib/Sema/SemaExprObjC.cpp
+++ b/lib/Sema/SemaExprObjC.cpp
@@ -268,12 +268,8 @@ Sema::ExprResult Sema::ActOnClassMessage(
   if (!Method)
     Method = ClassDecl->lookupInstanceMethod(Sel);
 
-  if (Method) {
-    if (Method->getAttr<DeprecatedAttr>())
-      Diag(receiverLoc, diag::warn_deprecated) << Method->getDeclName();
-    if (Method->getAttr<UnavailableAttr>())
-      Diag(receiverLoc, diag::warn_unavailable) << Method->getDeclName();
-  }
+  if (Method)
+    DiagnoseUseOfDeprecatedDecl(Method, receiverLoc);
   
   if (CheckMessageArgumentTypes(ArgExprs, NumArgs, Sel, Method, true, 
                                 lbrac, rbrac, returnType))
@@ -320,12 +316,8 @@ Sema::ExprResult Sema::ActOnInstanceMessage(ExprTy *receiver, Selector Sel,
           Method = SuperDecl->lookupInstanceMethod(Sel);
     }
 
-    if (Method) {
-      if (Method->getAttr<DeprecatedAttr>())
-        Diag(receiverLoc, diag::warn_deprecated) << Method->getDeclName();
-      if (Method->getAttr<UnavailableAttr>())
-        Diag(receiverLoc, diag::warn_unavailable) << Method->getDeclName();
-    }
+    if (Method)
+      DiagnoseUseOfDeprecatedDecl(Method, receiverLoc);
 
     if (CheckMessageArgumentTypes(ArgExprs, NumArgs, Sel, Method, false,
                                   lbrac, rbrac, returnType))
@@ -358,12 +350,8 @@ Sema::ExprResult Sema::ActOnInstanceMessage(ExprTy *receiver, Selector Sel,
               ObjCImplementations[ClassDecl->getIdentifier()])
           Method = ImpDecl->getClassMethod(Sel);
       
-      if (Method) {
-        if (Method->getAttr<DeprecatedAttr>())
-          Diag(receiverLoc, diag::warn_deprecated) << Method->getDeclName();
-        if (Method->getAttr<UnavailableAttr>())
-          Diag(receiverLoc, diag::warn_unavailable) << Method->getDeclName();
-      }
+      if (Method)
+        DiagnoseUseOfDeprecatedDecl(Method, receiverLoc);
     }
     if (!Method)
       Method = FactoryMethodPool[Sel].Method;
@@ -415,12 +403,8 @@ Sema::ExprResult Sema::ActOnInstanceMessage(ExprTy *receiver, Selector Sel,
       Diag(lbrac, diag::warn_method_not_found_in_protocol)
         << Sel << SourceRange(lbrac, rbrac);
     
-    if (Method) {
-      if (Method->getAttr<DeprecatedAttr>())
-        Diag(receiverLoc, diag::warn_deprecated) << Method->getDeclName();
-      if (Method->getAttr<UnavailableAttr>())
-        Diag(receiverLoc, diag::warn_unavailable) << Method->getDeclName();
-    }    
+    if (Method)
+      DiagnoseUseOfDeprecatedDecl(Method, receiverLoc);
   } else {
     Diag(lbrac, diag::error_bad_receiver_type)
       << RExpr->getType() << RExpr->getSourceRange();