Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[6.1] Fix build option for Synchronization and Distributed #78496

Merged
merged 3 commits into from
Jan 9, 2025

Conversation

meg-gupta
Copy link
Contributor

@meg-gupta meg-gupta commented Jan 8, 2025

Explanation: #77314 incorrectly named the parameter name which resulted in the -enable-ossa-modules being present in the swift interfaces of Synchronization and Distributed. This PR fixes the cmake function parameter name while querying for IMPORTS_NON_OSSA by using the right prefix used in cmake_parse_arguments

Scope: Removes -enable-ossa-modules from swiftinterfaces of Synchronization and Distributed

Original PRs: #78460

Issue: rdar://138407068

Risk: Low

Testing: swift ci testing and manually verified the absence of the flag in the swiftinterfaces of Synchronization and Distributed

Reviewed by: @tshortli

These utilities are called from MandatorPerformanceOptimizations which can run
on serialized non-ossa functions. Add a bailout to handle this case.
@meg-gupta
Copy link
Contributor Author

@swift-ci test

@meg-gupta meg-gupta changed the title Fix build option for Synchronization and Distributed [6.1] Fix build option for Synchronization and Distributed Jan 8, 2025
Since Synchronization is in non-ossa, it cannot be imported into an ossa module.

We have support for recompilation of the .swiftinterface with -enable-ossa-modules under implicit modules.
However, recompilation of modules in the resource dir is disabled unless serialization status is
serialization::Status::SDKMismatch in discoverUpToDateCompiledModuleForInterface.

Removing the -enable-ossa-module flag in this test to avoid module loading failure
@meg-gupta
Copy link
Contributor Author

@swift-ci test

@meg-gupta meg-gupta marked this pull request as ready for review January 9, 2025 15:37
@meg-gupta meg-gupta requested a review from a team as a code owner January 9, 2025 15:37
@meg-gupta meg-gupta enabled auto-merge January 9, 2025 22:47
@meg-gupta meg-gupta merged commit b8e183e into swiftlang:release/6.1 Jan 9, 2025
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants