Merge pull request #63943 from augusto2112/revert-print-name

Revert "Print the Swift mangled name as a field in C++ interop genera…

Author: augusto2112

lib/PrintAsClang/ClangSyntaxPrinter.cpp

@@ -435,16 +435,3 @@ void ClangSyntaxPrinter::printKnownCType(
   if (info->canBeNullable)
     os << " _Null_unspecified";
 }
-
-void ClangSyntaxPrinter::printSwiftMangledNameForDebugger(
-    const NominalTypeDecl *typeDecl) {
-  printIgnoredCxx17ExtensionDiagnosticBlock([&]() {
-    auto mangled_name = mangler.mangleTypeForDebugger(
-        typeDecl->getDeclaredInterfaceType(), nullptr);
-    if (!mangled_name.empty()) {
-      os << "  typedef char " << mangled_name << ";\n";
-      os << "  static inline constexpr " << mangled_name
-         << " $__swift_mangled_name = 0;\n";
-    }
-  });
-}

lib/PrintAsClang/ClangSyntaxPrinter.h

@@ -13,7 +13,6 @@
 #ifndef SWIFT_PRINTASCLANG_CLANGSYNTAXPRINTER_H
 #define SWIFT_PRINTASCLANG_CLANGSYNTAXPRINTER_H
 
-#include "swift/AST/ASTMangler.h"
 #include "swift/AST/Type.h"
 #include "swift/Basic/LLVM.h"
 #include "swift/ClangImporter/ClangImporter.h"
@@ -231,14 +230,8 @@ class ClangSyntaxPrinter {
   /// Print the given **known** type as a C type.
   void printKnownCType(Type t, PrimitiveTypeMapping &typeMapping) const;
 
-  /// Print the nominal type's Swift mangled name as a typedef from a char to
-  /// the mangled name, and a static constexpr variable declaration, whose type
-  /// is the aforementioned typedef, and whose name is known to the debugger.
-  void printSwiftMangledNameForDebugger(const NominalTypeDecl *typeDecl);
-
 protected:
   raw_ostream &os;
-  swift::Mangle::ASTMangler mangler;
 };
 
 } // end namespace swift

lib/PrintAsClang/PrintClangClassType.cpp

@@ -77,9 +77,6 @@ void ClangClassTypePrinter::printClassTypeDecl(
   os << "  friend class " << cxx_synthesis::getCxxImplNamespaceName() << "::";
   printCxxImplClassName(os, typeDecl);
   os << ";\n";
-
-  printer.printSwiftMangledNameForDebugger(typeDecl);
-
   os << "};\n\n";
 
   // Print out the "hidden" _impl class.

lib/PrintAsClang/PrintClangValueType.cpp

@@ -383,9 +383,6 @@ void ClangValueTypePrinter::printValueTypeDecl(
   printCxxImplClassName(os, typeDecl);
   printGenericParamRefs(os);
   os << ";\n";
-
-  printer.printSwiftMangledNameForDebugger(typeDecl);
-
   os << "};\n";
   os << '\n';