Skip to content

Conversation

@cachemeifyoucan
Copy link
Contributor

@cachemeifyoucan cachemeifyoucan commented Mar 28, 2024

Explanation: Adding bug fixes for swift-caching build to swift/release/6.0 branch
Issue: Various bug fixes that impacts swift caching build
Original PR:
#72427
#72459
#72498

Risk: Low. Change to experimental swift caching feature.
Testing: UnitTests
Reviewer: @benlangmuir @artemcm

@cachemeifyoucan cachemeifyoucan requested a review from akyrtzi March 28, 2024 18:22
@cachemeifyoucan cachemeifyoucan requested a review from a team as a code owner March 28, 2024 18:22
@cachemeifyoucan
Copy link
Contributor Author

@swift-ci please test

@cachemeifyoucan cachemeifyoucan changed the title Swift Caching Updates for swift-6.0 [6.0] Swift Caching Updates Mar 29, 2024
Assign the path returned from dependency scanner for the module to the
buffer identifier when loading modules from CAS. This fixes a warning in
module trace file generation about invariant violation and also an
assertion when generating swiftdeps file.

rdar://122905379
(cherry picked from commit e99a93b)
Set context hash for source module so swift-driver can use the hash to
compute output path if needed.

rdar://119202702
(cherry picked from commit f71cce1)
Fix the wrong flag on windows version options. Those options are not
paths.

(cherry picked from commit 6af80e2)
When direct-cc1 scanning mode is enabled, do not inherit -Xcc options
from the commandline as those are driver flags and clang importer
already handle the conversion.

rdar://125194535
(cherry picked from commit aad00e6)
@cachemeifyoucan cachemeifyoucan force-pushed the eng/PR-swift-caching-6.0 branch from be10cc2 to 376d137 Compare April 4, 2024 16:34
@cachemeifyoucan
Copy link
Contributor Author

@swift-ci please test

@cachemeifyoucan
Copy link
Contributor Author

ping for 6.0 review and merge

@akyrtzi akyrtzi merged commit 2007dfa into swiftlang:release/6.0 Apr 5, 2024
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