Skip to content

[6.0][ScanDependency] Handle -Xcc options that affects module generation #74106

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

Conversation

cachemeifyoucan
Copy link
Contributor

Explanation: Fix an issue when swift caching or direct cc1 scanning mode is enabled for explicit module build, some -Xcc flags that are affecting module generations are not passed to swift interface compilation job.
Scope: Fix module configuration mismatch when swift caching is on and certain -Xcc flags are passed to driver.
Issue: rdar://128873665
Original PR: #74012
Reviewer: @artemcm
Risk: Low. Only swift caching uses the new scanner mode.
Test: UnitTests.

Make sure the `-Xcc` options to the scanner are correctly considered
when creating ClangImporterCC1 arguments for constructed swift interface
compilation job. Under directcc1 mode, `-Xcc` options should be used to
constructed sub-invocation but should not be added to GenericArgs for
constructing interface compilation jobs.

rdar://128873665
(cherry picked from commit 42732c0)
@cachemeifyoucan cachemeifyoucan requested a review from a team as a code owner June 3, 2024 21:42
@cachemeifyoucan
Copy link
Contributor Author

@swift-ci please test

@cachemeifyoucan cachemeifyoucan merged commit 9471cfd into swiftlang:release/6.0 Jun 4, 2024
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants