Merge pull request #79048 from hborla/delete-infer-public-sendable-flag

[Concurrency] Remove `EnableInferPublicSendable`.

Author: hborla

include/swift/Basic/LangOptions.h

@@ -411,9 +411,6 @@ namespace swift {
     /// implementation quirk of previous compilers.
     bool DisableNamedLazyImportAsMemberLoading = false;
 
-    /// Enable inference of Sendable conformances for public types.
-    bool EnableInferPublicSendable = false;
-
     /// Disable the implicit import of the _Concurrency module.
     bool DisableImplicitConcurrencyModuleImport =
         !SWIFT_IMPLICIT_CONCURRENCY_IMPORT;

include/swift/Option/FrontendOptions.td

@@ -287,9 +287,6 @@ def copy_propagation_state_EQ :
   HelpText<"Whether to enable copy propagation">,
   MetaVarName<"true|requested-passes-only|false">;
 
-def enable_infer_public_concurrent_value : Flag<["-"], "enable-infer-public-sendable">,
-    HelpText<"Enable inference of Sendable conformances for public structs and enums">;
-
 def disable_infer_public_concurrent_value : Flag<["-"], "disable-infer-public-sendable">,
     HelpText<"Disable inference of Sendable conformances for public structs and enums">;
 

lib/Frontend/CompilerInvocation.cpp

@@ -924,11 +924,6 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
   Opts.EnableExperimentalConcurrency |=
     Args.hasArg(OPT_enable_experimental_concurrency);
 
-  Opts.EnableInferPublicSendable |=
-    Args.hasFlag(OPT_enable_infer_public_concurrent_value,
-                 OPT_disable_infer_public_concurrent_value,
-                 false);
-
   Opts.DisableExperimentalClangImporterDiagnostics |=
       Args.hasArg(OPT_disable_experimental_clang_importer_diagnostics);
 

lib/Sema/TypeCheckConcurrency.cpp

@@ -6815,10 +6815,8 @@ ProtocolConformance *swift::deriveImplicitSendableConformance(
 
   SendableCheck check;
 
-  // Okay to infer Sendable conformance for non-public types or when
-  // specifically requested.
-  if (nominal->getASTContext().LangOpts.EnableInferPublicSendable ||
-      !nominal->getFormalAccessScope(
+  // Okay to infer Sendable conformance for non-public types.
+  if (!nominal->getFormalAccessScope(
           /*useDC=*/nullptr, /*treatUsableFromInlineAsPublic=*/true)
             .isPublic()) {
     check = SendableCheck::Implicit;