Skip to content

[lldb] Fix SwiftASTContext creatiion when swift caching is used #9137

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
Aug 20, 2024
Merged

[lldb] Fix SwiftASTContext creatiion when swift caching is used #9137

merged 2 commits into from
Aug 20, 2024

Conversation

cachemeifyoucan
Copy link

Followup to #9088, handle the cc1 flag deserialization when swift caching is enabled. LLDB should ignore all the CAS related options from embedded flags since LLDB doesn't receive the correct CAS configuration and should just load the modules from disk directly.

rdar://134090397

@cachemeifyoucan
Copy link
Author

@swift-ci please test

adrian-prantl
adrian-prantl reviewed Aug 16, 2024
View reviewed changes
adrian-prantl
adrian-prantl reviewed Aug 16, 2024
View reviewed changes
@cachemeifyoucan
Copy link
Author

@swift-ci please test

@cachemeifyoucan cachemeifyoucan force-pushed the eng/PR-134090397 branch 2 times, most recently from c6ee94c to 83df1c4 Compare August 16, 2024 23:55
@cachemeifyoucan
Copy link
Author

@swift-ci please test

@cachemeifyoucan
Copy link
Author

Please test with following pull request:
swiftlang/swift#75964

@swift-ci please test

@cachemeifyoucan
Copy link
Author

@swift-ci please test

@cachemeifyoucan
Copy link
Author

@swift-ci please test macOS platform

@adrian-prantl
Copy link

@cachemeifyoucan This is on the wrong branch. Can you rebase this on swift/release/6.0 and then afterwards cherry-pick it to stable/202407.. and next?

@cachemeifyoucan
Copy link
Author

@cachemeifyoucan This is on the wrong branch. Can you rebase this on swift/release/6.0 and then afterwards cherry-pick it to stable/202407.. and next?

I thought you land on stable/2023... first before gets integrate to release/6.0. Sure I can re-target 6.0 and that should auto forward to stable/2023.

@cachemeifyoucan
[lldb] Fix SwiftASTContext creatiion when swift caching is used
1162e50 
Followup to swiftlang#9088, handle the cc1 flag deserialization when swift
caching is enabled. LLDB should ignore all the CAS related options from
embedded flags since LLDB doesn't receive the correct CAS configuration
and should just load the modules from disk directly.

rdar://134090397
@cachemeifyoucan
Add workaround for the wrong cc1 flag embedded by swift
81b0f13
@cachemeifyoucan cachemeifyoucan changed the base branch from stable/20230725 to swift/release/6.0 August 20, 2024 18:08
@cachemeifyoucan
Copy link
Author

@swift-ci please test

@cachemeifyoucan
Copy link
Author

@swift-ci please test windows platform

@cachemeifyoucan
Copy link
Author

@adrian-prantl Can you approve and merge for release/6.0?

@adrian-prantl
Copy link

I thought you land on stable/2023... first before gets integrate to release/6.0. Sure I can re-target 6.0 and that should auto forward to stable/2023.

The LLDB automerger flows in the opposite direction.

@adrian-prantl adrian-prantl merged commit 08bf953 into swiftlang:swift/release/6.0 Aug 20, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adrian-prantl adrian-prantl adrian-prantl approved these changes

@kastiglione kastiglione Awaiting requested review from kastiglione

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@cachemeifyoucan @adrian-prantl