Map package optimization flags to new features to match

a more standard method to enable optimizations.

Also set EnableSerializePackage to false by default.

Ref: rdar://124648653

Author: elsh

include/swift/AST/SILOptions.h

@@ -132,7 +132,7 @@ class SILOptions {
   /// to be built in the same project. To enable this optimization, the
   /// module also needs to opt in to allow non-resilient access with
   /// -experimental-allow-non-resilient-access.
-  bool EnableSerializePackage = true;
+  bool EnableSerializePackage = false;
 
   /// Enables the emission of stack protectors in functions.
   bool EnableStackProtection = true;

include/swift/Basic/Features.def

@@ -219,6 +219,19 @@ EXPERIMENTAL_FEATURE(LayoutPrespecialization, true)
 
 EXPERIMENTAL_FEATURE(AccessLevelOnImport, true)
 
+/// Enables a module to allow non resilient access from other
+/// modules within a package if built from source.
+EXPERIMENTAL_FEATURE(AllowNonResilientAccessInPackage, false)
+
+/// Enables a client module within a package to bypass resilient
+/// access (at use site) to decls defined in another module within
+/// the same package.
+EXPERIMENTAL_FEATURE(ClientBypassResilientAccessInPackage, false)
+
+/// Enables serialization of package decls and bodies and performs
+/// CMO within a package.
+EXPERIMENTAL_FEATURE(PackageCMO, false)
+
 /// Whether to enable experimental layout string value witnesses
 EXPERIMENTAL_FEATURE_EXCLUDED_FROM_MODULE_INTERFACE(LayoutStringValueWitnesses, true)
 EXPERIMENTAL_FEATURE_EXCLUDED_FROM_MODULE_INTERFACE(LayoutStringValueWitnessesInstantiation, true)

lib/AST/FeatureSet.cpp

@@ -468,13 +468,16 @@ static bool usesFeatureLayoutPrespecialization(Decl *decl) {
 }
 
 UNINTERESTING_FEATURE(AccessLevelOnImport)
+UNINTERESTING_FEATURE(AllowNonResilientAccessInPackage)
+UNINTERESTING_FEATURE(ClientBypassResilientAccessInPackage)
 UNINTERESTING_FEATURE(LayoutStringValueWitnesses)
 UNINTERESTING_FEATURE(LayoutStringValueWitnessesInstantiation)
 UNINTERESTING_FEATURE(DifferentiableProgramming)
 UNINTERESTING_FEATURE(ForwardModeDifferentiation)
 UNINTERESTING_FEATURE(AdditiveArithmeticDerivedConformances)
 UNINTERESTING_FEATURE(SendableCompletionHandlers)
 UNINTERESTING_FEATURE(OpaqueTypeErasure)
+UNINTERESTING_FEATURE(PackageCMO)
 UNINTERESTING_FEATURE(ParserRoundTrip)
 UNINTERESTING_FEATURE(ParserValidation)
 UNINTERESTING_FEATURE(ParserDiagnostics)

lib/Frontend/CompilerInvocation.cpp

@@ -681,7 +681,8 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
   Opts.EnablePackageInterfaceLoad = Args.hasArg(OPT_experimental_package_interface_load) ||
                                     ::getenv("SWIFT_ENABLE_PACKAGE_INTERFACE_LOAD");
 
-  Opts.EnableBypassResilienceInPackage = Args.hasArg(OPT_experimental_package_bypass_resilience);
+  Opts.EnableBypassResilienceInPackage = Args.hasArg(OPT_experimental_package_bypass_resilience) ||
+                                         Opts.hasFeature(Feature::ClientBypassResilientAccessInPackage);
 
   Opts.DisableAvailabilityChecking |=
       Args.hasArg(OPT_disable_availability_checking);
@@ -2101,7 +2102,7 @@ static bool ParseSILArgs(SILOptions &Opts, ArgList &Args,
                          const FrontendOptions &FEOpts,
                          const TypeCheckerOptions &TCOpts,
                          DiagnosticEngine &Diags,
-                         const llvm::Triple &Triple,
+                         LangOptions &LangOpts,
                          ClangImporterOptions &ClangOpts) {
   using namespace options;
 
@@ -2346,8 +2347,10 @@ static bool ParseSILArgs(SILOptions &Opts, ArgList &Args,
     Opts.CMOMode = CrossModuleOptimizationMode::Everything;
   }
 
-  if (Args.hasArg(OPT_ExperimentalPackageCMO)) {
-    if (!FEOpts.AllowNonResilientAccess) {
+  if (Args.hasArg(OPT_ExperimentalPackageCMO) ||
+      LangOpts.hasFeature(Feature::PackageCMO)) {
+    if (!(FEOpts.AllowNonResilientAccess ||
+          LangOpts.hasFeature(Feature::AllowNonResilientAccessInPackage))) {
       Diags.diagnose(SourceLoc(), diag::ignoring_option_requires_option,
                      "-experimental-package-cmo",
                      "-experimental-allow-non-resilient-access");
@@ -2439,7 +2442,7 @@ static bool ParseSILArgs(SILOptions &Opts, ArgList &Args,
 
   if (const Arg *A = Args.getLastArg(options::OPT_sanitize_EQ)) {
     Opts.Sanitizers = parseSanitizerArgValues(
-        Args, A, Triple, Diags,
+        Args, A, LangOpts.Target, Diags,
         /* sanitizerRuntimeLibExists= */[](StringRef libName, bool shared) {
 
           // The driver has checked the existence of the library
@@ -3289,7 +3292,7 @@ bool CompilerInvocation::parseArgs(
 
   if (ParseSILArgs(SILOpts, ParsedArgs, IRGenOpts, FrontendOpts,
                    TypeCheckerOpts, Diags,
-                   LangOpts.Target, ClangImporterOpts)) {
+                   LangOpts, ClangImporterOpts)) {
     return true;
   }
 

lib/Frontend/Frontend.cpp

@@ -1402,7 +1402,8 @@ ModuleDecl *CompilerInstance::getMainModule() const {
     if (Invocation.getLangOptions().EnableCXXInterop &&
         Invocation.getLangOptions().RequireCxxInteropToImportCxxInteropModule)
       MainModule->setHasCxxInteroperability();
-    if (Invocation.getFrontendOptions().AllowNonResilientAccess)
+    if (Invocation.getFrontendOptions().AllowNonResilientAccess ||
+        Context->LangOpts.hasFeature(Feature::AllowNonResilientAccessInPackage))
       MainModule->setAllowNonResilientAccess();
 
     // Register the main module with the AST context.