Skip to content
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

[beta] backports #118492

Merged
merged 7 commits into from
Dec 1, 2023
Merged

[beta] backports #118492

merged 7 commits into from
Dec 1, 2023

Conversation

cuviper
Copy link
Member

@cuviper cuviper commented Dec 1, 2023

r? ghost

compiler-errors and others added 7 commits November 30, 2023 16:51
@compiler-errors @cuviper
Build pre-coroutine-transform coroutine body
20b2dbf 
(cherry picked from commit 0ba7d19)
@tmiasko @cuviper
Fix coroutine validation for mixed panic strategy
ae0b24f 
Validation introduced in rust-lang#113124 allows UnwindAction::Continue and
TerminatorKind::Resume to occur only in functions with ABI that can
unwind. The function ABI depends on the panic strategy, which can vary
across crates.

Usually MIR is built and validated in the same crate. The coroutine drop
glue thus far was an exception. As a result validation could fail when
mixing different panic strategies.

Avoid the problem by executing AbortUnwindingCalls along with the
validation.

(cherry picked from commit 5161b22)
@aDotInTheVoid @cuviper
Precommit test for rust-lang#118328.
ebd43bd 
(cherry picked from commit b1a6cf4)
@aDotInTheVoid @cuviper
ConstProp: Remove const when rvalue check fails.
cb4f87a 
(cherry picked from commit 9121a41)
@aDotInTheVoid @cuviper
Rename and add another test
98d3e99 
(cherry picked from commit 6e956c0)
@wesleywiser @cuviper
Dispose llvm::TargetMachines prior to llvm::Context being disposed
76e6681 
If the TargetMachine is disposed after the Context is disposed, it can
lead to use after frees in some cases.

I've observed this happening occasionally on code compiled for
aarch64-pc-windows-msvc using `-Zstack-protector=strong` but other users
have reported AVs from host aarch64-pc-windows-msvc compilers as well.

(cherry picked from commit 3323e4d)
@wesleywiser @cuviper
Update compiler/rustc_codegen_llvm/src/lib.rs
6c45608 
Co-authored-by: Josh Stone <[email protected]>
(cherry picked from commit 1011078)
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Dec 1, 2023
@cuviper
Copy link
Member Author

cuviper commented Dec 1, 2023

@bors r+ rollup=never

@bors
Copy link
Contributor

bors commented Dec 1, 2023

📌 Commit 6c45608 has been approved by cuviper

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 1, 2023
@bors
Copy link
Contributor

bors commented Dec 1, 2023

⌛ Testing commit 6c45608 with merge 1a06ac5...

@bors
Copy link
Contributor

bors commented Dec 1, 2023

☀️ Test successful - checks-actions
Approved by: cuviper
Pushing 1a06ac5 to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 1, 2023
@bors bors merged commit 1a06ac5 into rust-lang:beta Dec 1, 2023
12 checks passed
@rustbot rustbot added this to the 1.75.0 milestone Dec 1, 2023
@cuviper cuviper deleted the beta-next branch December 8, 2023 00:23
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Feb 2, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.75.0
Development

Successfully merging this pull request may close these issues.
7 participants
@cuviper @bors @rustbot @compiler-errors @tmiasko @aDotInTheVoid @wesleywiser