Merge pull request #63707 from tshortli/remove-check-api-availability

Frontend: Remove support for the `-check-api-availability-only` flag

Author: tshortli

include/swift/AST/DiagnosticsFrontend.def

@@ -161,9 +161,6 @@ ERROR(error_mode_cannot_emit_module_semantic_info,none,
 ERROR(cannot_emit_ir_skipping_function_bodies,none,
       "the -experimental-skip-*-function-bodies* flags do not support "
       "emitting IR", ())
-ERROR(cannot_emit_ir_checking_api_availability_only,none,
-      "the flag -check-api-availability-only does not support "
-      "emitting IR", ())
 
 WARNING(emit_reference_dependencies_without_primary_file,none,
         "ignoring -emit-reference-dependencies (requires -primary-file)", ())

include/swift/Basic/LangOptions.h

@@ -171,9 +171,6 @@ namespace swift {
     /// Disable API availability checking.
     bool DisableAvailabilityChecking = false;
 
-    /// Only check the availability of the API, ignore function bodies.
-    bool CheckAPIAvailabilityOnly = false;
-
     /// Causes the compiler to use weak linkage for symbols belonging to
     /// declarations introduced at the deployment target.
     bool WeakLinkAtTarget = false;

include/swift/Option/Options.td

@@ -488,7 +488,7 @@ def define_availability : Separate<["-"], "define-availability">,
 
 def check_api_availability_only : Flag<["-"], "check-api-availability-only">,
   Flags<[HelpHidden, FrontendOption, NoInteractiveOption]>,
-  HelpText<"Only check the availability of the APIs, ignore function bodies">;
+  HelpText<"Deprecated, has no effect">;
 
 def library_level : Separate<["-"], "library-level">,
   MetaVarName<"<level>">,

lib/Frontend/ArgsToFrontendOptionsConverter.cpp

@@ -256,11 +256,6 @@ bool ArgsToFrontendOptionsConverter::convert(
       Diags.diagnose(SourceLoc(), diag::cannot_emit_ir_skipping_function_bodies);
       return true;
     }
-
-    if (Args.hasArg(OPT_check_api_availability_only)) {
-      Diags.diagnose(SourceLoc(), diag::cannot_emit_ir_checking_api_availability_only);
-      return true;
-    }
   }
 
   if (const Arg *A = Args.getLastArg(OPT_module_abi_name))

lib/Frontend/CompilerInvocation.cpp

@@ -548,8 +548,10 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
 
   Opts.DisableAvailabilityChecking |=
       Args.hasArg(OPT_disable_availability_checking);
-  Opts.CheckAPIAvailabilityOnly |=
-      Args.hasArg(OPT_check_api_availability_only);
+  if (Args.hasArg(OPT_check_api_availability_only))
+    Diags.diagnose(SourceLoc(), diag::warn_flag_deprecated,
+                   "-check-api-availability-only");
+
   Opts.WeakLinkAtTarget |= Args.hasArg(OPT_weak_link_at_target);
 
   if (auto A = Args.getLastArg(OPT_enable_conformance_availability_errors,
@@ -1195,12 +1197,6 @@ static bool ParseTypeCheckerArgs(TypeCheckerOptions &Opts, ArgList &Args,
   Opts.DebugTimeExpressions |=
       Args.hasArg(OPT_debug_time_expression_type_checking);
 
-  // Checking availability of the API only relies on skipping non-inlinable
-  // function bodies. Define it first so it can be overridden by the other
-  // flags.
-  if (Args.hasArg(OPT_check_api_availability_only))
-    Opts.SkipFunctionBodies = FunctionBodySkipping::NonInlinable;
-
   // Check for SkipFunctionBodies arguments in order from skipping less to
   // skipping more.
   if (Args.hasArg(

lib/Sema/TypeCheckAccess.cpp

@@ -2052,9 +2052,6 @@ class DeclAvailabilityChecker : public DeclVisitor<DeclAvailabilityChecker> {
   }
 
   void visitPatternBindingDecl(PatternBindingDecl *PBD) {
-    if (!shouldCheckAvailability(PBD->getAnchoringVarDecl(0)))
-      return;
-
     llvm::DenseSet<const VarDecl *> seenVars;
     for (auto idx : range(PBD->getNumPatternEntries())) {
       PBD->getPattern(idx)->forEachNode([&](const Pattern *P) {
@@ -2351,22 +2348,5 @@ void swift::checkAccessControl(Decl *D) {
   if (where.isImplicit())
     return;
 
-  if (!shouldCheckAvailability(D))
-    return;
-
   DeclAvailabilityChecker(where).visit(D);
 }
-
-bool swift::shouldCheckAvailability(const Decl *D) {
-  if (D && D->getASTContext().LangOpts.CheckAPIAvailabilityOnly) {
-    // Skip whole decl if not API-public.
-    if (auto valueDecl = dyn_cast<const ValueDecl>(D)) {
-      AccessScope scope =
-        valueDecl->getFormalAccessScope(/*useDC*/nullptr,
-                                        /*treatUsableFromInlineAsPublic*/true);
-      if (!scope.isPublic())
-        return false;
-    }
-  }
-  return true;
-}

lib/Sema/TypeCheckAvailability.cpp

@@ -2051,9 +2051,6 @@ void TypeChecker::checkConcurrencyAvailability(SourceRange ReferenceRange,
   if (ctx.LangOpts.DisableAvailabilityChecking)
     return;
 
-  if (!shouldCheckAvailability(ReferenceDC->getAsDecl()))
-    return;
-  
   auto runningOS =
     TypeChecker::overApproximateAvailabilityAtLocation(
       ReferenceRange.Start, ReferenceDC);
@@ -3022,9 +3019,6 @@ bool swift::diagnoseParameterizedProtocolAvailability(
   if (ctx.LangOpts.DisableAvailabilityChecking)
     return false;
 
-  if (!shouldCheckAvailability(ReferenceDC->getAsDecl()))
-    return false;
-
   auto runningOS = TypeChecker::overApproximateAvailabilityAtLocation(
       ReferenceRange.Start, ReferenceDC);
   auto availability = ctx.getParameterizedExistentialRuntimeAvailability();

lib/Sema/TypeCheckAvailability.h

@@ -282,10 +282,6 @@ bool diagnoseParameterizedProtocolAvailability(SourceRange loc,
 /// Check if \p decl has a introduction version required by -require-explicit-availability
 void checkExplicitAvailability(Decl *decl);
 
-/// Check if \p D needs to be checked for correct availability depending on the
-/// flag -check-api-availability-only.
-bool shouldCheckAvailability(const Decl *D);
-
 } // namespace swift
 
 #endif // SWIFT_SEMA_TYPE_CHECK_AVAILABILITY_H

lib/Sema/TypeCheckConstraints.cpp

@@ -777,16 +777,6 @@ bool TypeChecker::typeCheckBinding(Pattern *&pattern, Expr *&initializer,
                 initializer, DC, patternType, pattern,
                 /*bindPatternVarsOneWay=*/false);
 
-  if (DC->getASTContext().LangOpts.CheckAPIAvailabilityOnly &&
-      PBD && !DC->getAsDecl()) {
-    // Skip checking the initializer for non-public decls when
-    // checking the API only.
-    auto VD = PBD->getAnchoringVarDecl(0);
-    if (!swift::shouldCheckAvailability(VD)) {
-      options |= TypeCheckExprFlags::DisableExprAvailabilityChecking;
-    }
-  }
-
   // Type-check the initializer.
   auto resultTarget = typeCheckExpression(target, options);