[interop][SwiftToCxx] NFC, refactor printKnownCType method to ClangSyntaxPrinter for reuse

Author: hyp

lib/PrintAsClang/ClangSyntaxPrinter.cpp

@@ -11,6 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "ClangSyntaxPrinter.h"
+#include "PrimitiveTypeMapping.h"
 #include "swift/ABI/MetadataValues.h"
 #include "swift/AST/ASTContext.h"
 #include "swift/AST/Decl.h"
@@ -424,3 +425,13 @@ void ClangSyntaxPrinter::printSymbolUSRAttribute(const ValueDecl *D) const {
     return;
   os << " SWIFT_SYMBOL(\"" << result << "\")";
 }
+
+void ClangSyntaxPrinter::printKnownCType(
+    Type t, PrimitiveTypeMapping &typeMapping) const {
+  auto info =
+      typeMapping.getKnownCTypeInfo(t->getNominalOrBoundGenericNominal());
+  assert(info.has_value() && "not a known type");
+  os << info->name;
+  if (info->canBeNullable)
+    os << " _Null_unspecified";
+}

lib/PrintAsClang/ClangSyntaxPrinter.h

@@ -13,9 +13,10 @@
 #ifndef SWIFT_PRINTASCLANG_CLANGSYNTAXPRINTER_H
 #define SWIFT_PRINTASCLANG_CLANGSYNTAXPRINTER_H
 
-#include "swift/IRGen/GenericRequirement.h"
+#include "swift/AST/Type.h"
 #include "swift/Basic/LLVM.h"
 #include "swift/ClangImporter/ClangImporter.h"
+#include "swift/IRGen/GenericRequirement.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/raw_ostream.h"
 
@@ -25,6 +26,7 @@ class CanGenericSignature;
 class GenericTypeParamType;
 class ModuleDecl;
 class NominalTypeDecl;
+class PrimitiveTypeMapping;
 
 namespace cxx_synthesis {
 
@@ -225,6 +227,9 @@ class ClangSyntaxPrinter {
   /// on the generated declaration.
   void printSymbolUSRAttribute(const ValueDecl *D) const;
 
+  /// Print the given **known** type as a C type.
+  void printKnownCType(Type t, PrimitiveTypeMapping &typeMapping) const;
+
 protected:
   raw_ostream &os;
 };

lib/PrintAsClang/PrintSwiftToClangCoreScaffold.cpp

@@ -23,24 +23,14 @@
 
 using namespace swift;
 
-static void printKnownCType(Type t, PrimitiveTypeMapping &typeMapping,
-                            raw_ostream &os) {
-  auto info =
-      typeMapping.getKnownCTypeInfo(t->getNominalOrBoundGenericNominal());
-  assert(info.has_value() && "not a known type");
-  os << info->name;
-  if (info->canBeNullable)
-    os << " _Null_unspecified";
-}
-
 static void printKnownStruct(
     PrimitiveTypeMapping &typeMapping, raw_ostream &os, StringRef name,
     const IRABIDetailsProvider::TypeRecordABIRepresentation &typeRecord) {
   assert(typeRecord.getMembers().size() > 1);
   os << "struct " << name << " {\n";
   for (const auto &ty : llvm::enumerate(typeRecord.getMembers())) {
     os << "  ";
-    printKnownCType(ty.value(), typeMapping, os);
+    ClangSyntaxPrinter(os).printKnownCType(ty.value(), typeMapping);
     os << " _" << ty.index() << ";\n";
   }
   os << "};\n";
@@ -51,7 +41,8 @@ static void printKnownTypedef(
     const IRABIDetailsProvider::TypeRecordABIRepresentation &typeRecord) {
   assert(typeRecord.getMembers().size() == 1);
   os << "typedef ";
-  printKnownCType(typeRecord.getMembers()[0], typeMapping, os);
+  ClangSyntaxPrinter(os).printKnownCType(typeRecord.getMembers()[0],
+                                         typeMapping);
   os << " " << name << ";\n";
 }