[ClangImporter] Refactor off CF reasoning helpers

Move helper methods off of the Impl and into CFTypeInfo.h, where we
have the other CF type reasoning logic.

NFC

Author: milseman

lib/ClangImporter/CFTypeInfo.cpp

@@ -101,14 +101,14 @@ CFPointeeInfo::classifyTypedef(const clang::TypedefNameDecl *typedefDecl) {
   return forInvalid();
 }
 
-bool ClangImporter::Implementation::isCFTypeDecl(
+bool importer::isCFTypeDecl(
        const clang::TypedefNameDecl *Decl) {
   if (CFPointeeInfo::classifyTypedef(Decl))
     return true;
   return false;
 }
 
-StringRef ClangImporter::Implementation::getCFTypeName(
+StringRef importer::getCFTypeName(
             const clang::TypedefNameDecl *decl) {
   if (auto pointee = CFPointeeInfo::classifyTypedef(decl)) {
     auto name = decl->getName();

lib/ClangImporter/CFTypeInfo.h

@@ -104,6 +104,13 @@ class CFPointeeInfo {
     return Decl.get<const clang::TypedefNameDecl *>();
   }
 };
+
+/// Determine whether this typedef is a CF type.
+bool isCFTypeDecl(const clang::TypedefNameDecl *Decl);
+
+/// Determine the imported CF type for the given typedef-name, or the empty
+/// string if this is not an imported CF type name.
+llvm::StringRef getCFTypeName(const clang::TypedefNameDecl *decl);
 }
 }
 

lib/ClangImporter/IAMInference.cpp

@@ -503,8 +503,7 @@ class IAMInference {
 static StringRef getTypeName(clang::QualType qt) {
   if (auto typedefTy = qt->getAs<clang::TypedefType>()) {
     // Check for a CF type name (drop the "Ref")
-    auto cfName = ClangImporter::Implementation::getCFTypeName(
-        typedefTy->getDecl()->getCanonicalDecl());
+    auto cfName = getCFTypeName(typedefTy->getDecl()->getCanonicalDecl());
     if (cfName != StringRef())
       return cfName;
   }

lib/ClangImporter/ImportName.cpp

@@ -15,6 +15,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "CFTypeInfo.h"
 #include "IAMInference.h"
 #include "ImporterImpl.h"
 #include "ClangDiagnosticConsumer.h"

lib/ClangImporter/ImportType.cpp

@@ -14,6 +14,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "CFTypeInfo.h"
 #include "ImporterImpl.h"
 #include "ClangDiagnosticConsumer.h"
 #include "swift/Strings.h"
@@ -573,7 +574,7 @@ namespace {
       ImportHint hint = ImportHint::None;
 
       if (Impl.getSwiftNewtypeAttr(type->getDecl(), /*useSwift2Name=*/false)) {
-        if (ClangImporter::Implementation::isCFTypeDecl(type->getDecl()))
+        if (isCFTypeDecl(type->getDecl()))
           hint = ImportHint::SwiftNewtypeFromCFPointer;
         else
           hint = ImportHint::SwiftNewtype;

lib/ClangImporter/ImporterImpl.h

@@ -717,13 +717,6 @@ class LLVM_LIBRARY_VISIBILITY ClangImporter::Implementation
   /// or a null type if the DeclContext does not have a corresponding type.
   static clang::QualType getClangDeclContextType(const clang::DeclContext *dc);
 
-  /// Determine whether this typedef is a CF type.
-  static bool isCFTypeDecl(const clang::TypedefNameDecl *Decl);
-
-  /// Determine the imported CF type for the given typedef-name, or the empty
-  /// string if this is not an imported CF type name.
-  static StringRef getCFTypeName(const clang::TypedefNameDecl *decl);
-
   /// Retrieve the type name of a Clang type for the purposes of
   /// omitting unneeded words.
   static OmissionTypeName getClangTypeNameForOmission(clang::ASTContext &ctx,