Merge pull request #59533 from nkcsgexi/95385661

ABIChecker: diagnose removal of deprecated symbols by default

Author: nkcsgexi

include/swift/APIDigester/ModuleAnalyzerNodes.h

@@ -157,6 +157,7 @@ struct CheckerOptions {
   bool PrintModule;
   bool SwiftOnly;
   bool SkipOSCheck;
+  bool SkipRemoveDeprecatedCheck;
   bool CompilerStyle;
   bool Migrator;
   StringRef LocationFilter;

include/swift/Option/Options.td

@@ -1446,6 +1446,10 @@ def disable_os_checks: Flag<["-", "--"], "disable-os-checks">,
   Flags<[NoDriverOption, SwiftAPIDigesterOption]>,
   HelpText<"Skip OS related diagnostics">;
 
+def disable_remove_deprecated_check: Flag<["-", "--"], "disable-remove-deprecated-check">,
+  Flags<[NoDriverOption, SwiftAPIDigesterOption]>,
+  HelpText<"Skip diagnosing removal of deprecated symbols">;
+
 def print_module: Flag<["-", "--"], "print-module">,
   Flags<[NoDriverOption, SwiftAPIDigesterOption]>,
   HelpText<"Print module names in diagnostics">;

lib/APIDigester/ModuleAnalyzerNodes.cpp

@@ -2554,6 +2554,7 @@ void swift::ide::api::dumpModuleContent(ModuleDecl *MD, StringRef OutputFile,
   opts.AvoidToolArgs = true;
   opts.Migrator = false;
   opts.SkipOSCheck = false;
+  opts.SkipRemoveDeprecatedCheck = false;
   opts.Verbose = false;
   SDKContext ctx(opts);
   SwiftDeclCollector collector(ctx);

lib/DriverTool/swift_api_digester_main.cpp

@@ -553,10 +553,12 @@ static void diagnoseRemovedDecl(const SDKNodeDecl *D) {
     if (D->hasDeclAttribute(DeclAttrKind::DAK_AlwaysEmitIntoClient))
       return;
   }
+  auto &Ctx = D->getSDKContext();
   // Don't diagnose removal of deprecated APIs.
-  if (!D->isDeprecated()) {
-    D->emitDiag(SourceLoc(), diag::removed_decl, false);
-  }
+  if (Ctx.getOpts().SkipRemoveDeprecatedCheck &&
+      D->isDeprecated())
+    return;
+  D->emitDiag(SourceLoc(), diag::removed_decl, false);
 }
 
 // This is first pass on two given SDKNode trees. This pass removes the common part
@@ -2334,6 +2336,7 @@ class SwiftAPIDigesterInvocation {
     CheckerOpts.SwiftOnly =
         ParsedArgs.hasArg(OPT_abi) || ParsedArgs.hasArg(OPT_swift_only);
     CheckerOpts.SkipOSCheck = ParsedArgs.hasArg(OPT_disable_os_checks);
+    CheckerOpts.SkipRemoveDeprecatedCheck = ParsedArgs.hasArg(OPT_disable_remove_deprecated_check);
     CheckerOpts.CompilerStyle =
         CompilerStyleDiags || !SerializedDiagPath.empty();
     for (auto Arg : Args)