Fix regression with handling of CFMakeCollectable.

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

diff --git a/lib/Analysis/CFRefCount.cpp b/lib/Analysis/CFRefCount.cpp
index 1a38d957eb1124fc007b224d2956c6000a832b24..ff911678da82c386206efcdffbdac746dfd00d7f 100644 (file)
--- a/lib/Analysis/CFRefCount.cpp
+++ b/lib/Analysis/CFRefCount.cpp
@@ -787,7 +787,9 @@ static bool isRelease(FunctionDecl* FD, const char* FName) {
 
 RetainSummary* RetainSummaryManager::getCFSummary(FunctionDecl* FD,
                                                   const char* FName) {
-
+  if (FName[0] == 'C' && FName[1] == 'F')
+    FName += 2;
+  
   if (isRetain(FD, FName))
     return getUnarySummary(FD, cfretain);
   
@@ -803,6 +805,9 @@ RetainSummary* RetainSummaryManager::getCFSummary(FunctionDecl* FD,
 RetainSummary* RetainSummaryManager::getCGSummary(FunctionDecl* FD,
                                                   const char* FName) {
   
+  if (FName[0] == 'C' && FName[1] == 'G')
+    FName += 2;
+  
   if (isRelease(FD, FName))
     return getUnarySummary(FD, cfrelease);