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.

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

Fix rust-call ICE in mir-inliner #98823

Merged
merged 1 commit into from
Jul 4, 2022

Conversation

compiler-errors
Copy link
Member

Fixes #98821
r? @cjgillot

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jul 2, 2022
@rustbot
Copy link
Collaborator

rustbot commented Jul 2, 2022

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 2, 2022
@@ -180,16 +180,20 @@ impl<'tcx> Inliner<'tcx> {
return Err("failed to normalize return type");
}
if callsite.fn_sig.abi() == Abi::RustCall {
let mut args = args.into_iter();
let _ = args.next(); // Skip `self` argument.
let arg_tuple_ty = args.next().unwrap().ty(&caller_body.local_decls, self.tcx);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should contemplate banning the use of unwrap from the compiler 😄.

@cjgillot
Copy link
Contributor

cjgillot commented Jul 3, 2022

Thanks @compiler-errors
@bors r+

@bors
Copy link
Contributor

bors commented Jul 3, 2022

📌 Commit 3406319 has been approved by cjgillot

@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 Jul 3, 2022
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jul 3, 2022
…e, r=cjgillot

Fix rust-call ICE in mir-inliner

Fixes rust-lang#98821
r? `@cjgillot`
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 4, 2022
…askrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#98501 (rustc_passes/src/entry.rs: De-duplicate more code with `fn throw_attr_err()`)
 - rust-lang#98774 (rustdoc: make source sidebar toggle a real button)
 - rust-lang#98806 (Fix long declaration trailing whitespace)
 - rust-lang#98823 (Fix rust-call ICE in mir-inliner)
 - rust-lang#98870 (Add regression test for rust-lang#86784)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 79add33 into rust-lang:master Jul 4, 2022
@rustbot rustbot added this to the 1.64.0 milestone Jul 4, 2022
@compiler-errors compiler-errors deleted the rust-call-mir-inline branch August 11, 2023 20:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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
Development

Successfully merging this pull request may close these issues.

ICE during mir inlining: None in compiler/rustc_mir_transform/src/inline.rs:185:32
5 participants