[6.2][Distributed] Cleanup branch to avoid merge conflicts in future #82612
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts a revert that was done internally here https://stashweb.sd.apple.com/projects/DEVTOOLS/repos/swift/pull-requests/8697/overview and corrects some issues with the reverted code while at it. This fix is crucial to land for correctness and necessary to fix the rdar://144568615 which had a fix submitted however that assumed that THIS change also was present, so the fix submitted for 144568615 is incomplete without this change as well. This enables, and adds more TBD testing and was explicitly checked against the GameKit reproducer project from rdar://144568615. I will also upstream the necessary parts missing from OSS repo there so we have alignment between all branches.
Contributor
Author
|
@swift-ci please test |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Very minor pick which only aims to reduce potential for merge conflicts in the future.
Picks #82611