[interop] refactor PrimitiveTypeMapping to use one struct regardless of language

Author: hyp

lib/PrintAsClang/PrimitiveTypeMapping.cpp

@@ -118,7 +118,7 @@ void PrimitiveTypeMapping::initialize(ASTContext &ctx) {
                 "SIMD elements is changed");
 }
 
-PrimitiveTypeMapping::ClangTypeInfo *
+PrimitiveTypeMapping::FullClangTypeInfo *
 PrimitiveTypeMapping::getMappedTypeInfoOrNull(const TypeDecl *typeDecl) {
   if (mappedTypeNames.empty())
     initialize(typeDecl->getASTContext());
@@ -131,27 +131,27 @@ PrimitiveTypeMapping::getMappedTypeInfoOrNull(const TypeDecl *typeDecl) {
   return &iter->second;
 }
 
-Optional<PrimitiveTypeMapping::ObjCClangTypeInfo>
+Optional<PrimitiveTypeMapping::ClangTypeInfo>
 PrimitiveTypeMapping::getKnownObjCTypeInfo(const TypeDecl *typeDecl) {
   if (auto *typeInfo = getMappedTypeInfoOrNull(typeDecl))
-    return ObjCClangTypeInfo{typeInfo->objcName, typeInfo->canBeNullable};
+    return ClangTypeInfo{typeInfo->objcName, typeInfo->canBeNullable};
   return None;
 }
 
-Optional<PrimitiveTypeMapping::CClangTypeInfo>
+Optional<PrimitiveTypeMapping::ClangTypeInfo>
 PrimitiveTypeMapping::getKnownCTypeInfo(const TypeDecl *typeDecl) {
   if (auto *typeInfo = getMappedTypeInfoOrNull(typeDecl)) {
     if (typeInfo->cName)
-      return CClangTypeInfo{*typeInfo->cName, typeInfo->canBeNullable};
+      return ClangTypeInfo{*typeInfo->cName, typeInfo->canBeNullable};
   }
   return None;
 }
 
-Optional<PrimitiveTypeMapping::CxxClangTypeInfo>
+Optional<PrimitiveTypeMapping::ClangTypeInfo>
 PrimitiveTypeMapping::getKnownCxxTypeInfo(const TypeDecl *typeDecl) {
   if (auto *typeInfo = getMappedTypeInfoOrNull(typeDecl)) {
     if (typeInfo->cxxName)
-      return CxxClangTypeInfo{*typeInfo->cxxName, typeInfo->canBeNullable};
+      return ClangTypeInfo{*typeInfo->cxxName, typeInfo->canBeNullable};
   }
   return None;
 }

lib/PrintAsClang/PrimitiveTypeMapping.h

@@ -30,37 +30,27 @@ class TypeDecl;
 /// but to something like `intptr_t` or `swift::Int` for C and C++ declarations.
 class PrimitiveTypeMapping {
 public:
-  struct ObjCClangTypeInfo {
+  struct ClangTypeInfo {
     StringRef name;
     bool canBeNullable;
   };
 
   /// Returns the Objective-C type name and nullability for the given Swift
   /// primitive type declaration, or \c None if no such type name exists.
-  Optional<ObjCClangTypeInfo> getKnownObjCTypeInfo(const TypeDecl *typeDecl);
-
-  struct CClangTypeInfo {
-    StringRef name;
-    bool canBeNullable;
-  };
+  Optional<ClangTypeInfo> getKnownObjCTypeInfo(const TypeDecl *typeDecl);
 
   /// Returns the C type name and nullability for the given Swift
   /// primitive type declaration, or \c None if no such type name exists.
-  Optional<CClangTypeInfo> getKnownCTypeInfo(const TypeDecl *typeDecl);
-
-  struct CxxClangTypeInfo {
-    StringRef name;
-    bool canBeNullable;
-  };
+  Optional<ClangTypeInfo> getKnownCTypeInfo(const TypeDecl *typeDecl);
 
   /// Returns the C++ type name and nullability for the given Swift
   /// primitive type declaration, or \c None if no such type name exists.
-  Optional<CxxClangTypeInfo> getKnownCxxTypeInfo(const TypeDecl *typeDecl);
+  Optional<ClangTypeInfo> getKnownCxxTypeInfo(const TypeDecl *typeDecl);
 
 private:
   void initialize(ASTContext &ctx);
 
-  struct ClangTypeInfo {
+  struct FullClangTypeInfo {
     // The Objective-C name of the Swift type.
     StringRef objcName;
     // The C name of the Swift type.
@@ -70,15 +60,15 @@ class PrimitiveTypeMapping {
     bool canBeNullable;
   };
 
-  ClangTypeInfo *getMappedTypeInfoOrNull(const TypeDecl *typeDecl);
+  FullClangTypeInfo *getMappedTypeInfoOrNull(const TypeDecl *typeDecl);
 
   /// A map from {Module, TypeName} pairs to {C name, C nullability} pairs.
   ///
   /// This is populated on first use with a list of known Swift types that are
   /// translated directly by the ObjC printer instead of structurally, allowing
   /// it to do things like map 'Int' to 'NSInteger' and 'Float' to 'float'.
   /// In some sense it's the reverse of the ClangImporter's MappedTypes.def.
-  llvm::DenseMap<std::pair<Identifier, Identifier>, ClangTypeInfo>
+  llvm::DenseMap<std::pair<Identifier, Identifier>, FullClangTypeInfo>
       mappedTypeNames;
 };