Skip to content

Commit 38fe923

Browse files
authored
Merge pull request swiftlang#78276 from meg-gupta/removeossaerrorcp
[6.1] Remove diagnostic error for importing non ossa module to ossa module when EBM is not enabled
2 parents d9b2863 + ae617c6 commit 38fe923

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

lib/Serialization/SerializedModuleLoader.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1193,8 +1193,7 @@ void swift::serialization::diagnoseSerializedASTLoadFailure(
11931193
moduleBufferID);
11941194
break;
11951195
case serialization::Status::NotInOSSA:
1196-
if (Ctx.SerializationOpts.ExplicitModuleBuild ||
1197-
!Ctx.SILOpts.EnableRecompilationToOSSAModule) {
1196+
if (Ctx.SerializationOpts.ExplicitModuleBuild) {
11981197
Ctx.Diags.diagnose(diagLoc,
11991198
diag::serialization_non_ossa_module_incompatible,
12001199
ModuleName);

0 commit comments

Comments
 (0)