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 ICE due to out-of-bounds statement index when reporting borrowck error #91212

Merged
merged 2 commits into from
Nov 26, 2021

Conversation

compiler-errors
Copy link
Member

Replace an [index] with a .get when statement_index points to a basic-block terminator (and is therefore out-of-bounds in the statements list).

Fixes #91206
Cc @camsteffen
r? @oli-obk

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 25, 2021
@oli-obk
Copy link
Contributor

oli-obk commented Nov 25, 2021

r=me with the test from the issue added as a regression test

@compiler-errors
Copy link
Member Author

Added a minimized test which demonstrates the ICE on nightly and no longer ICEs on this branch.

@oli-obk
Copy link
Contributor

oli-obk commented Nov 25, 2021

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Nov 25, 2021

📌 Commit 69d1917 has been approved by oli-obk

@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 Nov 25, 2021
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Nov 25, 2021
Fix ICE due to out-of-bounds statement index when reporting borrowck error

Replace an `[index]` with a `.get` when `statement_index` points to a basic-block terminator (and is therefore out-of-bounds in the statements list).

Fixes rust-lang#91206
Cc `@camsteffen`
r? `@oli-obk`
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Nov 25, 2021
Fix ICE due to out-of-bounds statement index when reporting borrowck error

Replace an `[index]` with a `.get` when `statement_index` points to a basic-block terminator (and is therefore out-of-bounds in the statements list).

Fixes rust-lang#91206
Cc ``@camsteffen``
r? ``@oli-obk``
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Nov 25, 2021
Fix ICE due to out-of-bounds statement index when reporting borrowck error

Replace an `[index]` with a `.get` when `statement_index` points to a basic-block terminator (and is therefore out-of-bounds in the statements list).

Fixes rust-lang#91206
Cc ```@camsteffen```
r? ```@oli-obk```
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Nov 26, 2021
Fix ICE due to out-of-bounds statement index when reporting borrowck error

Replace an `[index]` with a `.get` when `statement_index` points to a basic-block terminator (and is therefore out-of-bounds in the statements list).

Fixes rust-lang#91206
Cc `@camsteffen`
r? `@oli-obk`
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 26, 2021
…askrgr

Rollup of 4 pull requests

Successful merges:

 - rust-lang#91169 (Change cg_ssa's get_param to borrow the builder mutably)
 - rust-lang#91176 (If the thread does not get the lock in the short term, yield the CPU)
 - rust-lang#91212 (Fix ICE due to out-of-bounds statement index when reporting borrowck error)
 - rust-lang#91225 (Fix invalid scrollbar display on source code page)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 13c6066 into rust-lang:master Nov 26, 2021
@rustbot rustbot added this to the 1.58.0 milestone Nov 26, 2021
@compiler-errors compiler-errors deleted the issue91206 branch December 3, 2021 07:09
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Nightly compiler panics when attempting to mutate a shared reference.
5 participants