Skip to content

Fix build option for Synchronization and Distributed #78460

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

Merged
merged 2 commits into from
Jan 8, 2025

Conversation

meg-gupta
Copy link
Contributor

#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.

These utilities are called from MandatorPerformanceOptimizations which can run
on serialized non-ossa functions. Add a bailout to handle this case.
@meg-gupta meg-gupta requested review from a team and eeckstein as code owners January 7, 2025 09:59
@meg-gupta
Copy link
Contributor Author

@swift-ci test

@meg-gupta meg-gupta requested review from tshortli and nkcsgexi January 7, 2025 09:59
@@ -3169,9 +3169,12 @@ static AllocationInst *getOptimizableAllocation(SILInstruction *i) {
}

bool swift::optimizeMemoryAccesses(SILFunction *fn) {
if (!fn->hasOwnership()) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did fixing the presence of the flag reveal some new issues?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah. Now that Synchronization and Distributed are serialized in non-ossa, I had to add these bailouts since we run mandatory optimizations on serialized functions as well.

@meg-gupta
Copy link
Contributor Author

@swift-ci smoke test

@meg-gupta
Copy link
Contributor Author

@swift-ci test Linux platform

@meg-gupta meg-gupta enabled auto-merge January 7, 2025 22:02
@meg-gupta
Copy link
Contributor Author

@swift-ci test Linux platform

@meg-gupta meg-gupta merged commit 8397fc3 into swiftlang:main Jan 8, 2025
4 of 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