Merge pull request swiftlang#77579 from DougGregor/revert-abi-comments-printing

Revert "Emit mangled names for public symbols into the .swiftinterface"

Author: DougGregor

include/swift/AST/PrintOptions.h

@@ -535,10 +535,6 @@ struct PrintOptions {
   /// with types sharing a name with a module.
   bool AliasModuleNames = false;
 
-  /// Print some ABI details for public symbols as comments that can be
-  /// parsed by another tool.
-  bool PrintABIComments = false;
-
   /// Name of the modules that have been aliased in AliasModuleNames mode.
   /// Ideally we would use something other than a string to identify a module,
   /// but since one alias can apply to more than one module, strings happen
@@ -729,8 +725,7 @@ struct PrintOptions {
                                               bool useExportedModuleNames,
                                               bool aliasModuleNames,
                                               llvm::SmallSet<StringRef, 4>
-                                                *aliasModuleNamesTargets,
-                                              bool abiComments
+                                                *aliasModuleNamesTargets
                                               );
 
   /// Retrieve the set of options suitable for "Generated Interfaces", which

include/swift/Frontend/ModuleInterfaceSupport.h

@@ -44,10 +44,6 @@ struct ModuleInterfaceOptions {
   /// [TODO: Clang-type-plumbing] This check should go away.
   bool PrintFullConvention = false;
 
-  /// Print some ABI details for public symbols as comments that can be
-  /// parsed by another tool.
-  bool ABIComments = false;
-
   struct InterfaceFlags {
     /// Copy of all the command-line flags passed at .swiftinterface
     /// generation time, re-applied to CompilerInvocation when reading

include/swift/Option/FrontendOptions.td

@@ -1050,9 +1050,6 @@ def disable_alias_module_names_in_module_interface :
   Flag<["-"], "disable-alias-module-names-in-module-interface">,
   HelpText<"When emitting a module interface, disable disambiguating modules "
            "using distinct alias names">;
-def abi_comments_in_module_interface :
-  Flag<["-"], "abi-comments-in-module-interface">,
-  HelpText<"When emitting a module interface, emit comments with ABI details">;
 
 def experimental_spi_imports :
   Flag<["-"], "experimental-spi-imports">,

lib/AST/ASTPrinter.cpp

@@ -201,8 +201,8 @@ PrintOptions PrintOptions::printSwiftInterfaceFile(ModuleDecl *ModuleToPrint,
                                                    bool useExportedModuleNames,
                                                    bool aliasModuleNames,
                                                    llvm::SmallSet<StringRef, 4>
-                                                     *aliasModuleNamesTargets,
-                                                   bool abiComments) {
+                                                     *aliasModuleNamesTargets
+                                                   ) {
   PrintOptions result;
   result.IsForSwiftInterface = true;
   result.PrintLongAttrsOnSeparateLines = true;
@@ -224,7 +224,6 @@ PrintOptions PrintOptions::printSwiftInterfaceFile(ModuleDecl *ModuleToPrint,
   result.PreferTypeRepr = preferTypeRepr;
   result.AliasModuleNames = aliasModuleNames;
   result.AliasModuleNamesTargets = aliasModuleNamesTargets;
-  result.PrintABIComments = abiComments;
   if (printFullConvention)
     result.PrintFunctionRepresentationAttrs =
       PrintOptions::FunctionRepresentationMode::Full;
@@ -765,28 +764,19 @@ class PrintAST : public ASTVisitor<PrintAST> {
     printRawComment(RC);
   }
 
-  /// If we should print a mangled name for this declaration, return that
-  /// mangled name.
-  std::optional<std::string> mangledNameToPrint(const Decl *D);
-
   void printDocumentationComment(const Decl *D) {
-    if (Options.PrintDocumentationComments) {
-      // Try to print a comment from Clang.
-      auto MaybeClangNode = D->getClangNode();
-      if (MaybeClangNode) {
-        if (auto *CD = MaybeClangNode.getAsDecl())
-          printClangDocumentationComment(CD);
-        return;
-      }
+    if (!Options.PrintDocumentationComments)
+      return;
 
-      printSwiftDocumentationComment(D);
+    // Try to print a comment from Clang.
+    auto MaybeClangNode = D->getClangNode();
+    if (MaybeClangNode) {
+      if (auto *CD = MaybeClangNode.getAsDecl())
+        printClangDocumentationComment(CD);
+      return;
     }
 
-    if (auto mangledName = mangledNameToPrint(D)) {
-      indent();
-      Printer << "// MANGLED NAME: " << *mangledName;
-      Printer.printNewline();
-    }
+    printSwiftDocumentationComment(D);
   }
 
   void printStaticKeyword(StaticSpellingKind StaticSpelling) {
@@ -3114,58 +3104,6 @@ void PrintAST::printExtension(ExtensionDecl *decl) {
   }
 }
 
-std::optional<std::string> PrintAST::mangledNameToPrint(const Decl *D) {
-  using ASTMangler = Mangle::ASTMangler;
-
-  if (!Options.PrintABIComments)
-    return std::nullopt;
-
-  auto valueDecl = dyn_cast<ValueDecl>(D);
-  if (!valueDecl)
-    return std::nullopt;
-
-  // Anything with an access level less than "package" isn't meant to be
-  // referenced from source code outside the module.
-  if (valueDecl->getEffectiveAccess() < AccessLevel::Package)
-    return std::nullopt;
-
-  // For functions, mangle the entity directly.
-  if (auto func = dyn_cast<FuncDecl>(D)) {
-    ASTMangler mangler;
-    return mangler.mangleEntity(func);
-  }
-
-  // For initializers, mangle the allocating initializer.
-  if (auto init = dyn_cast<ConstructorDecl>(D)) {
-    ASTMangler mangler;
-    return mangler.mangleConstructorEntity(init, /*isAllocating=*/true);
-  }
-
-  // For variables, mangle the entity directly.
-  if (auto var = dyn_cast<VarDecl>(D)) {
-    ASTMangler mangler;
-    return mangler.mangleEntity(var);
-  }
-
-  // For subscripts, mangle the entity directly.
-  if (auto subscript = dyn_cast<SubscriptDecl>(D)) {
-    ASTMangler mangler;
-    return mangler.mangleEntity(subscript);
-  }
-
-  // For nominal types, mangle the type metadata accessor.
-  if (auto nominal = dyn_cast<NominalTypeDecl>(D)) {
-    if (!isa<ProtocolDecl>(nominal) && !nominal->getGenericSignature()) {
-      ASTMangler mangler;
-      std::string name = mangler.mangleNominalType(nominal);
-      name += "Ma";
-      return name;
-    }
-  }
-
-  return std::nullopt;
-}
-
 static void suppressingFeatureIsolatedAny(PrintOptions &options,
                                           llvm::function_ref<void()> action) {
   llvm::SaveAndRestore<bool> scope(options.SuppressIsolatedAny, true);

lib/Frontend/CompilerInvocation.cpp

@@ -523,7 +523,6 @@ static void ParseModuleInterfaceArgs(ModuleInterfaceOptions &Opts,
     Args.hasArg(OPT_debug_emit_invalid_swiftinterface_syntax);
   Opts.PrintMissingImports =
     !Args.hasArg(OPT_disable_print_missing_imports_in_module_interface);
-  Opts.ABIComments = Args.hasArg(OPT_abi_comments_in_module_interface);
 
   if (const Arg *A = Args.getLastArg(OPT_library_level)) {
     StringRef contents = A->getValue();

lib/Frontend/ModuleInterfaceSupport.cpp

@@ -878,7 +878,7 @@ bool swift::emitSwiftInterface(raw_ostream &out,
       M, Opts.PreserveTypesAsWritten, Opts.PrintFullConvention,
       Opts.InterfaceContentMode,
       useExportedModuleNames,
-      Opts.AliasModuleNames, &aliasModuleNamesTargets, Opts.ABIComments);
+      Opts.AliasModuleNames, &aliasModuleNamesTargets);
   InheritedProtocolCollector::PerTypeMap inheritedProtocolMap;
 
   SmallVector<Decl *, 16> topLevelDecls;