[Import as member] Don't infer special CF memory management names

Author: milseman

lib/ClangImporter/IAMInference.cpp

@@ -39,6 +39,8 @@ STATISTIC(FailInferFunction, "# of functions unable to infer");
 // Specifically skipped/avoided
 STATISTIC(SkipLeadingUnderscore,
           "# of globals skipped due to leading underscore");
+STATISTIC(SkipCFMemoryManagement,
+          "# of CF memory management globals skipped");
 
 // Success statistics
 STATISTIC(SuccessImportAsTypeID, "# imported as 'typeID'");
@@ -176,6 +178,7 @@ class IAMInference {
   }
 
   IAMResult infer(const clang::NamedDecl *);
+  IAMResult inferVar(const clang::VarDecl *);
 
 private:
   // typeID
@@ -617,39 +620,43 @@ bool IAMInference::validToImportAsProperty(
   return isValidAsInstanceProperty(getterDecl, setterDecl);
 }
 
-IAMResult IAMInference::infer(const clang::NamedDecl *clangDecl) {
-  if (clangDecl->getName().startswith("_")) {
-    ++SkipLeadingUnderscore;
+IAMResult IAMInference::inferVar(const clang::VarDecl *varDecl) {
+  auto fail = [varDecl]() -> IAMResult {
+    DEBUG(llvm::dbgs() << "failed to infer variable: ");
+    DEBUG(varDecl->print(llvm::dbgs()));
+    DEBUG(llvm::dbgs() << "\n");
+    ++FailInferVar;
     return {};
-  }
+  };
 
-  if (auto varDecl = dyn_cast<clang::VarDecl>(clangDecl)) {
-    auto fail = [varDecl]() -> IAMResult {
-      DEBUG(llvm::dbgs() << "failed to infer variable: ");
-      DEBUG(varDecl->print(llvm::dbgs()));
-      DEBUG(llvm::dbgs() << "\n");
-      ++FailInferVar;
-      return {};
-    };
+  // Try to find a type to add this as a static property to
+  StringRef workingName = varDecl->getName();
+  if (workingName.empty())
+    return fail();
 
-    // Try to find a type to add this as a static property to
-    StringRef workingName = varDecl->getName();
-    if (workingName.empty())
-      return fail();
+  // Special pattern: constants of the form "kFooBarBaz", extend "FooBar" with
+  // property "Baz"
+  if (*camel_case::getWords(workingName).begin() == "k")
+    workingName = workingName.drop_front(1);
 
-    // Special pattern: constants of the form "kFooBarBaz", extend "FooBar" with
-    // property "Baz"
-    if (*camel_case::getWords(workingName).begin() == "k")
-      workingName = workingName.drop_front(1);
+  NameBuffer remainingName;
+  if (auto effectiveDC = findTypeAndMatch(workingName, remainingName))
 
-    NameBuffer remainingName;
-    if (auto effectiveDC = findTypeAndMatch(workingName, remainingName))
+    return importAsStaticProperty(remainingName, effectiveDC);
 
-      return importAsStaticProperty(remainingName, effectiveDC);
+  return fail();
+}
 
-    return fail();
+IAMResult IAMInference::infer(const clang::NamedDecl *clangDecl) {
+  if (clangDecl->getName().startswith("_")) {
+    ++SkipLeadingUnderscore;
+    return {};
   }
 
+  // Try to infer a member variable
+  if (auto varDecl = dyn_cast<clang::VarDecl>(clangDecl))
+    return inferVar(varDecl);
+
   // Try to infer a member function
   auto funcDecl = dyn_cast<clang::FunctionDecl>(clangDecl);
   if (!funcDecl) {
@@ -675,9 +682,11 @@ IAMResult IAMInference::infer(const clang::NamedDecl *clangDecl) {
   auto retTy = funcDecl->getReturnType();
   unsigned numParams = funcDecl->getNumParams();
 
-  // 0) Special cases are specially handled: *GetTypeID()
+  // 0) Special cases are specially handled
   //
   StringRef getTypeID = "GetTypeID";
+  StringRef cfSpecials[] = {"Release", "Retain", "Autorelease"};
+  // *GetTypeID
   if (numParams == 0 && workingName.endswith(getTypeID)) {
     NameBuffer remainingName;
     if (auto effectiveDC = findTypeAndMatch(
@@ -688,6 +697,19 @@ IAMResult IAMInference::infer(const clang::NamedDecl *clangDecl) {
         return importAsTypeID(retTy, effectiveDC);
       }
     }
+    // *Release/*Retain/*Autorelease
+  } else if (numParams == 1 &&
+             std::any_of(std::begin(cfSpecials), std::end(cfSpecials),
+                         [workingName](StringRef suffix) {
+                           return workingName.endswith(suffix);
+                         })) {
+    if (auto type =
+            funcDecl->getParamDecl(0)->getType()->getAs<clang::TypedefType>()) {
+      if (CFPointeeInfo::classifyTypedef(type->getDecl())) {
+        ++SkipCFMemoryManagement;
+        return {};
+      }
+    }
   }
 
   // 1) If we find an init specifier and our name matches the return type, we