Serialization: remove the IS_OSSA flag from the module file header

eeckstein · eeckstein · commit a322fd920916 · 2025-09-26T08:01:08.000+02:00
diff --git a/include/swift/AST/DiagnosticsSema.def b/include/swift/AST/DiagnosticsSema.def
@@ -958,9 +958,6 @@ ERROR(serialization_target_too_new_repl,none,
       "deployment target of %0 %3: %4",
       (StringRef, llvm::VersionTuple, Identifier, llvm::VersionTuple,
        StringRef))
-ERROR(serialization_non_ossa_module_incompatible, Fatal,
-      "cannot import non-OSSA module into an OSSA module",
-      (Identifier))
 
 ERROR(serialization_fatal,Fatal,
       "fatal error encountered while reading from module '%0'; "
diff --git a/include/swift/Serialization/SerializationOptions.h b/include/swift/Serialization/SerializationOptions.h
@@ -162,7 +162,6 @@ class SerializationOptions {
   bool StaticLibrary = false;
   bool HermeticSealAtLink = false;
   bool EmbeddedSwiftModule = false;
-  bool IsOSSA = false;
   bool SkipNonExportableDecls = false;
   bool ExplicitModuleBuild = false;
   bool EnableSerializationRemarks = false;
diff --git a/include/swift/Serialization/Validation.h b/include/swift/Serialization/Validation.h
@@ -51,9 +51,6 @@ enum class Status {
   /// The distribution channel doesn't match.
   ChannelIncompatible,
 
-  /// The module is required to be in OSSA, but is not.
-  NotInOSSA,
-
   /// The module file depends on another module that can't be loaded.
   MissingDependency,
 
diff --git a/lib/DriverTool/sil_func_extractor_main.cpp b/lib/DriverTool/sil_func_extractor_main.cpp
@@ -361,7 +361,6 @@ int sil_func_extractor_main(ArrayRef<const char *> argv, void *MainAddr) {
     serializationOpts.OutputPath = OutputFile;
     serializationOpts.SerializeAllSIL = true;
     serializationOpts.IsSIB = true;
-    serializationOpts.IsOSSA = true;
 
     symbolgraphgen::SymbolGraphOptions symbolGraphOpts;
 
diff --git a/lib/DriverTool/sil_opt_main.cpp b/lib/DriverTool/sil_opt_main.cpp
@@ -1081,7 +1081,6 @@ int sil_opt_main(ArrayRef<const char *> argv, void *MainAddr) {
     serializationOpts.OutputPath = OutputFile;
     serializationOpts.SerializeAllSIL = options.EmitSIB;
     serializationOpts.IsSIB = options.EmitSIB;
-    serializationOpts.IsOSSA = true;
 
     symbolgraphgen::SymbolGraphOptions symbolGraphOptions;
 
diff --git a/lib/Frontend/Frontend.cpp b/lib/Frontend/Frontend.cpp
@@ -281,8 +281,6 @@ SerializationOptions CompilerInvocation::computeSerializationOptions(
     serializationOpts.SerializeDebugInfoSIL = true;
   }
 
-  serializationOpts.IsOSSA = true;
-
   serializationOpts.SkipNonExportableDecls =
       getLangOptions().SkipNonExportableDecls;
 
diff --git a/lib/Frontend/ModuleInterfaceBuilder.cpp b/lib/Frontend/ModuleInterfaceBuilder.cpp
@@ -310,7 +310,6 @@ std::error_code ExplicitModuleInterfaceBuilder::buildSwiftModuleFromInterface(
       return std::make_error_code(std::errc::not_supported);
     SerializationOpts.Dependencies = Deps;
   }
-  SerializationOpts.IsOSSA = true;
 
   SILMod->setSerializeSILAction([&]() {
     // We don't want to serialize module docs in the cache -- they
diff --git a/lib/FrontendTool/FrontendTool.cpp b/lib/FrontendTool/FrontendTool.cpp
@@ -1754,7 +1754,6 @@ static bool serializeSIB(SILModule *SM, const PrimarySpecificPaths &PSPs,
   serializationOpts.OutputPath = moduleOutputPath;
   serializationOpts.SerializeAllSIL = true;
   serializationOpts.IsSIB = true;
-  serializationOpts.IsOSSA = true;
 
   symbolgraphgen::SymbolGraphOptions symbolGraphOptions;
 
diff --git a/lib/Serialization/ModuleFileSharedCore.cpp b/lib/Serialization/ModuleFileSharedCore.cpp
@@ -483,12 +483,6 @@ static ValidationInfo validateControlBlock(
       }
       break;
     }
-    case control_block::IS_OSSA: {
-      auto isModuleInOSSA = scratch[0];
-      if (!isModuleInOSSA)
-        result.status = Status::NotInOSSA;
-      break;
-    }
     default:
       // Unknown metadata record, possibly for use by a future version of the
       // module format.
@@ -592,7 +586,6 @@ std::string serialization::StatusToString(Status S) {
   case Status::FormatTooNew: return "FormatTooNew";
   case Status::RevisionIncompatible: return "RevisionIncompatible";
   case Status::ChannelIncompatible: return "ChannelIncompatible";
-  case Status::NotInOSSA: return "NotInOSSA";
   case Status::MissingDependency: return "MissingDependency";
   case Status::MissingUnderlyingModule: return "MissingUnderlyingModule";
   case Status::CircularDependency: return "CircularDependency";
diff --git a/lib/Serialization/ModuleFormat.h b/lib/Serialization/ModuleFormat.h
@@ -58,7 +58,7 @@ const uint16_t SWIFTMODULE_VERSION_MAJOR = 0;
 /// describe what change you made. The content of this comment isn't important;
 /// it just ensures a conflict if two people change the module format.
 /// Don't worry about adhering to the 80-column limit for this line.
-const uint16_t SWIFTMODULE_VERSION_MINOR = 961; // borrow/mutate accessors
+const uint16_t SWIFTMODULE_VERSION_MINOR = 962; // remove IS_OSSA flag from header
 
 /// A standard hash seed used for all string hashes in a serialized module.
 ///
@@ -905,7 +905,6 @@ namespace control_block {
     TARGET,
     SDK_NAME,
     REVISION,
-    IS_OSSA,
     ALLOWABLE_CLIENT_NAME,
     CHANNEL,
     SDK_VERSION,
@@ -944,11 +943,6 @@ namespace control_block {
     BCBlob
   >;
 
-  using IsOSSALayout = BCRecordLayout<
-    IS_OSSA,
-    BCFixed<1>
-  >;
-
   using AllowableClientLayout = BCRecordLayout<
     ALLOWABLE_CLIENT_NAME,
     BCBlob
diff --git a/lib/Serialization/Serialization.cpp b/lib/Serialization/Serialization.cpp
@@ -840,7 +840,6 @@ void Serializer::writeBlockInfoBlock() {
   BLOCK_RECORD(control_block, TARGET);
   BLOCK_RECORD(control_block, SDK_NAME);
   BLOCK_RECORD(control_block, REVISION);
-  BLOCK_RECORD(control_block, IS_OSSA);
   BLOCK_RECORD(control_block, ALLOWABLE_CLIENT_NAME);
   BLOCK_RECORD(control_block, CHANNEL);
   BLOCK_RECORD(control_block, SDK_VERSION);
@@ -1016,7 +1015,6 @@ void Serializer::writeHeader() {
     control_block::SDKVersionLayout SDKVersion(Out);
     control_block::RevisionLayout Revision(Out);
     control_block::ChannelLayout Channel(Out);
-    control_block::IsOSSALayout IsOSSA(Out);
     control_block::AllowableClientLayout Allowable(Out);
 
     // Write module 'real name', which can be different from 'name'
@@ -1073,8 +1071,6 @@ void Serializer::writeHeader() {
 
     Channel.emit(ScratchRecord, version::getCurrentCompilerChannel());
 
-    IsOSSA.emit(ScratchRecord, Options.IsOSSA);
-
     {
       llvm::BCBlockRAII restoreBlock(Out, OPTIONS_BLOCK_ID, 4);
 
diff --git a/lib/Serialization/SerializedModuleLoader.cpp b/lib/Serialization/SerializedModuleLoader.cpp
@@ -313,8 +313,6 @@ std::optional<std::string> SerializedModuleLoaderBase::invalidModuleReason(seria
     return "compiled with a different version of the compiler";
   case Status::ChannelIncompatible:
     return "compiled for a different distribution channel";
-  case Status::NotInOSSA:
-    return "module was not built with OSSA";
   case Status::MissingDependency:
     return "missing dependency";
   case Status::MissingUnderlyingModule:
@@ -1149,11 +1147,6 @@ void swift::serialization::diagnoseSerializedASTLoadFailure(
     Ctx.Diags.diagnose(diagLoc, diag::serialization_module_too_old, ModuleName,
                        moduleBufferID);
     break;
-  case serialization::Status::NotInOSSA:
-    Ctx.Diags.diagnose(diagLoc,
-                       diag::serialization_non_ossa_module_incompatible,
-                       ModuleName);
-    break;
   case serialization::Status::RevisionIncompatible:
     Ctx.Diags.diagnose(diagLoc, diag::serialization_module_incompatible_revision,
                        loadInfo.problematicRevision, ModuleName, moduleBufferID);
@@ -1248,7 +1241,6 @@ void swift::serialization::diagnoseSerializedASTLoadFailureTransitive(
   case serialization::Status::Valid:
   case serialization::Status::FormatTooNew:
   case serialization::Status::FormatTooOld:
-  case serialization::Status::NotInOSSA:
   case serialization::Status::RevisionIncompatible:
   case serialization::Status::ChannelIncompatible:
   case serialization::Status::Malformed:

Original file line number	Diff line number	Diff line change
`@@ -281,8 +281,6 @@ SerializationOptions CompilerInvocation::computeSerializationOptions(`
`281`	`281`	`serializationOpts.SerializeDebugInfoSIL = true;`
`282`	`282`	`}`
`283`	`283`
`284`		`- serializationOpts.IsOSSA = true;`
`285`		`-`
`286`	`284`	`serializationOpts.SkipNonExportableDecls =`
`287`	`285`	`getLangOptions().SkipNonExportableDecls;`
`288`	`286`
Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,6 @@ std::error_code ExplicitModuleInterfaceBuilder::buildSwiftModuleFromInterface(`
`310`	`310`	`return std::make_error_code(std::errc::not_supported);`
`311`	`311`	`SerializationOpts.Dependencies = Deps;`
`312`	`312`	`}`
`313`		`- SerializationOpts.IsOSSA = true;`
`314`	`313`
`315`	`314`	`SILMod->setSerializeSILAction([&]() {`
`316`	`315`	`// We don't want to serialize module docs in the cache -- they`