Merge pull request #59438 from hyp/eng/interop-rename-printValueTypeDecl

[interop][SwiftToCxx] NFC, rename printStructDecl to printValueTypeDecl

Author: hyp

lib/PrintAsClang/DeclAndTypePrinter.cpp

@@ -331,11 +331,12 @@ class DeclAndTypePrinter::Implementation
   void visitStructDecl(StructDecl *SD) {
     if (outputLang != OutputLanguageMode::Cxx)
       return;
+    // FIXME: Print struct's doc comment.
     // FIXME: Print struct's availability.
     ClangValueTypePrinter printer(os, owningPrinter.prologueOS,
                                   owningPrinter.typeMapping,
                                   owningPrinter.interopContext);
-    printer.printStructDecl(SD);
+    printer.printValueTypeDecl(SD);
   }
 
   void visitExtensionDecl(ExtensionDecl *ED) {

lib/PrintAsClang/PrintClangValueType.cpp

@@ -73,9 +73,10 @@ void printCTypeMetadataTypeFunction(raw_ostream &os,
   os << " SWIFT_NOEXCEPT SWIFT_CALL;\n\n";
 }
 
-void ClangValueTypePrinter::printStructDecl(const StructDecl *SD) {
+void ClangValueTypePrinter::printValueTypeDecl(
+    const NominalTypeDecl *typeDecl) {
   auto typeSizeAlign =
-      interopContext.getIrABIDetails().getTypeSizeAlignment(SD);
+      interopContext.getIrABIDetails().getTypeSizeAlignment(typeDecl);
   if (!typeSizeAlign) {
     // FIXME: handle non-fixed layout structs.
     return;
@@ -88,31 +89,31 @@ void ClangValueTypePrinter::printStructDecl(const StructDecl *SD) {
   ClangSyntaxPrinter printer(os);
 
   auto typeMetadataFunc = irgen::LinkEntity::forTypeMetadataAccessFunction(
-      SD->getDeclaredType()->getCanonicalType());
+      typeDecl->getDeclaredType()->getCanonicalType());
   std::string typeMetadataFuncName = typeMetadataFunc.mangleAsString();
 
   // Print out a forward declaration of the "hidden" _impl class.
   printer.printNamespace(cxx_synthesis::getCxxImplNamespaceName(),
                          [&](raw_ostream &os) {
                            os << "class ";
-                           printCxxImplClassName(os, SD);
+                           printCxxImplClassName(os, typeDecl);
                            os << ";\n\n";
 
                            // Print out special functions, like functions that
                            // access type metadata.
-                           printCTypeMetadataTypeFunction(os, SD,
+                           printCTypeMetadataTypeFunction(os, typeDecl,
                                                           typeMetadataFuncName);
                          });
 
   // Print out the C++ class itself.
   os << "class ";
-  ClangSyntaxPrinter(os).printBaseName(SD);
+  ClangSyntaxPrinter(os).printBaseName(typeDecl);
   os << " final {\n";
   os << "public:\n";
 
   // Print out the destructor.
   os << "  inline ~";
-  printer.printBaseName(SD);
+  printer.printBaseName(typeDecl);
   os << "() {\n";
   os << "    auto metadata = " << cxx_synthesis::getCxxImplNamespaceName()
      << "::";
@@ -125,9 +126,9 @@ void ClangValueTypePrinter::printStructDecl(const StructDecl *SD) {
   os << "  }\n";
 
   os << "  inline ";
-  printer.printBaseName(SD);
+  printer.printBaseName(typeDecl);
   os << "(const ";
-  printer.printBaseName(SD);
+  printer.printBaseName(typeDecl);
   os << " &other) {\n";
   os << "    auto metadata = " << cxx_synthesis::getCxxImplNamespaceName()
      << "::";
@@ -142,24 +143,24 @@ void ClangValueTypePrinter::printStructDecl(const StructDecl *SD) {
 
   // FIXME: the move constructor should be hidden somehow.
   os << "  inline ";
-  printer.printBaseName(SD);
+  printer.printBaseName(typeDecl);
   os << "(";
-  printer.printBaseName(SD);
+  printer.printBaseName(typeDecl);
   os << " &&) = default;\n";
 
   // FIXME: Print the other members of the struct.
   os << "private:\n";
 
   // Print out private default constructor.
   os << "  inline ";
-  printer.printBaseName(SD);
+  printer.printBaseName(typeDecl);
   os << "() {}\n";
   // Print out '_make' function which returns an unitialized instance for
   // passing to Swift.
   os << "  static inline ";
-  printer.printBaseName(SD);
+  printer.printBaseName(typeDecl);
   os << " _make() { return ";
-  printer.printBaseName(SD);
+  printer.printBaseName(typeDecl);
   os << "(); }\n";
   // Print out the private accessors to the underlying Swift value storage.
   os << "  inline const char * _Nonnull _getOpaquePointer() const { return "
@@ -172,32 +173,32 @@ void ClangValueTypePrinter::printStructDecl(const StructDecl *SD) {
   os << "char _storage[" << typeSizeAlign->size << "];\n";
   // Wrap up the value type.
   os << "  friend class " << cxx_synthesis::getCxxImplNamespaceName() << "::";
-  printCxxImplClassName(os, SD);
+  printCxxImplClassName(os, typeDecl);
   os << ";\n";
   os << "};\n\n";
 
   // Print out the "hidden" _impl class.
   printer.printNamespace(
       cxx_synthesis::getCxxImplNamespaceName(), [&](raw_ostream &os) {
         os << "class ";
-        printCxxImplClassName(os, SD);
+        printCxxImplClassName(os, typeDecl);
         os << " {\n";
         os << "public:\n";
 
         os << "  static inline char * _Nonnull getOpaquePointer(";
-        printCxxTypeName(os, SD);
+        printCxxTypeName(os, typeDecl);
         os << " &object) { return object._getOpaquePointer(); }\n";
 
         os << "  static inline const char * _Nonnull getOpaquePointer(const ";
-        printCxxTypeName(os, SD);
+        printCxxTypeName(os, typeDecl);
         os << " &object) { return object._getOpaquePointer(); }\n";
 
         os << "  template<class T>\n";
         os << "  static inline ";
-        printCxxTypeName(os, SD);
+        printCxxTypeName(os, typeDecl);
         os << " returnNewValue(T callable) {\n";
         os << "    auto result = ";
-        printCxxTypeName(os, SD);
+        printCxxTypeName(os, typeDecl);
         os << "::_make();\n";
         os << "    callable(result._getOpaquePointer());\n";
         os << "    return result;\n";
@@ -206,7 +207,7 @@ void ClangValueTypePrinter::printStructDecl(const StructDecl *SD) {
         os << "};\n";
       });
 
-  printCValueTypeStorageStruct(cPrologueOS, SD, *typeSizeAlign);
+  printCValueTypeStorageStruct(cPrologueOS, typeDecl, *typeSizeAlign);
 }
 
 /// Print the name of the C stub struct for passing/returning a value type

lib/PrintAsClang/PrintClangValueType.h

@@ -35,9 +35,9 @@ class ClangValueTypePrinter {
       : os(os), cPrologueOS(cPrologueOS), typeMapping(typeMapping),
         interopContext(interopContext) {}
 
-  /// Print the C struct thunk or the C++ class definition that
-  /// corresponds to the given structure declaration.
-  void printStructDecl(const StructDecl *SD);
+  /// Print the C++ class definition that
+  /// corresponds to the given structure or enum declaration.
+  void printValueTypeDecl(const NominalTypeDecl *typeDecl);
 
   /// Print the pararameter type that referes to a Swift struct type in C/C++.
   void printValueTypeParameterType(const NominalTypeDecl *type,