Skip to content

Swift-Rebranch: Update rebranch branch with changes made to apple/stable/20210628 #3088

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

Closed

Conversation

etcwilde
Copy link
Member

@etcwilde etcwilde commented Jul 9, 2021

This merges the changes that have been made to the apple/stable/20210628 branch onto the swift/rebranch branch to unblock work there. Specifically, we need the changes made to the coroutine splitting and the swiftasync calling conventions in clang.

The ones currently blocking work there are:

aschwaighofer and others added 11 commits July 7, 2021 11:06
The resume partial functions generated for swift suspend points will now
use a Swift mangling suffix.

Await resume partial functions will use the suffix 'TQ'[0-9]+'_' (e.g "...TQ0_")
and suspend resume partial functions will use the suffix 'TY'[0-9]+'_'
(e.g "...TY1_").

Reviewed By: nate_chandler

Differential Revision: https://reviews.llvm.org/D104144
Code assumes that uses of single predecessor phis are not live accross
suspend points. Cleanup any single predecessor phis preceeding the code
making this assumption.

rdar://76020301

Differential Revision: https://reviews.llvm.org/D105488
While upstreaming patches this code somehow was applied to the wrong switch statement.

Differential Revision: https://reviews.llvm.org/D105504
…y_picks_mangling_single_pred_phis

Cherry-pick coro async mangling and single predecessor phi fix
…th-invoke_80288883

arm64e: fix test for merged return path
…gine to allow diagnostics on target-unsupported options

Reviewed By: aaron.ballman

Differential Revision: https://reviews.llvm.org/D104729

(cherry picked from commit aaba371)
…ft-async-calling-conventions

Swift-next Cherry-pick: Swift async calling conventions

(cherry picked from commit 0fa8fb6)
[clang][PATCH][nfc] Refactor TargetInfo::adjust to pass DiagnosticsEn…
…ventions-for-20210628

Swift-rebranch Cherry-pick: Swift async calling conventions
@etcwilde etcwilde requested a review from edymtt July 9, 2021 18:43
@etcwilde
Copy link
Member Author

etcwilde commented Jul 9, 2021

@swift-ci please test

@etcwilde etcwilde force-pushed the ewilde/update-swift-rebranch branch from 876f62d to ede4955 Compare July 13, 2021 03:46
@etcwilde
Copy link
Member Author

Pretty sure we don't need this anymore. That rebranch has come and gone.

@etcwilde etcwilde closed this Jan 26, 2022
@etcwilde etcwilde deleted the ewilde/update-swift-rebranch branch January 26, 2022 16:33
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.

5 participants