objc arc: Diagnose block pointer type mismatch when

some arguments types are ns_consumed and some otherwise
matching types are not. This is objc side of
// rdar://10187884

llvm-svn: 140729

1 files changed, 4 insertions, 16 deletions

diff --git a/clang/lib/Sema/SemaOverload.cpp b/clang/lib/Sema/SemaOverload.cpp
index 63d4f5ade3f..0c9083ef2f2 100644
--- a/clang/lib/Sema/SemaOverload.cpp
+++ b/clang/lib/Sema/SemaOverload.cpp
@@ -2074,22 +2074,10 @@ bool Sema::IsBlockPointerConversion(QualType FromType, QualType ToType,
        // Argument types are too different. Abort.
        return false;
    }
-   if (LangOpts.ObjCAutoRefCount) {
-     if (FromFunctionType->hasAnyConsumedArgs() != 
-         ToFunctionType->hasAnyConsumedArgs())
-      return false;
-     FunctionProtoType::ExtProtoInfo FromEPI = 
-      FromFunctionType->getExtProtoInfo();
-     FunctionProtoType::ExtProtoInfo ToEPI = 
-      ToFunctionType->getExtProtoInfo();
-     if (FromEPI.ConsumedArguments && ToEPI.ConsumedArguments)
-       for (unsigned ArgIdx = 0, NumArgs = FromFunctionType->getNumArgs();
-            ArgIdx != NumArgs; ++ArgIdx)  {
-         if (FromEPI.ConsumedArguments[ArgIdx] != 
-             ToEPI.ConsumedArguments[ArgIdx])
-           return false;
-       }
-   }
+   if (LangOpts.ObjCAutoRefCount && 
+       !Context.FunctionTypesMatchOnNSConsumedAttrs(FromFunctionType, 
+                                                    ToFunctionType))
+     return false;
    
    ConvertedType = ToType;
    return true;