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

Handle index out of bound errors during const eval without panic #61598

Merged
merged 1 commit into from
Jun 13, 2019
Merged

Handle index out of bound errors during const eval without panic #61598

merged 1 commit into from
Jun 13, 2019

Conversation

estebank
Copy link
Contributor

@estebank estebank commented Jun 6, 2019

Fix #61595

@rust-highfive
Copy link
Collaborator

r? @pnkfelix

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 6, 2019
@estebank
Copy link
Contributor Author

estebank commented Jun 6, 2019 •
edited
Loading

cc @RalfJung @varkor @oli-obk

@estebank estebank added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jun 6, 2019
@estebank
Copy link
Contributor Author

estebank commented Jun 6, 2019 •
edited
Loading

Nominating for beta because it's an ICE and there's a high likelihood of a point release, but it is not critical to backport (we've had this ICE for quite a while).

Edit: as @jonas-schievink rightly interpreted, I meant backporting to beta only, not stable.

@jonas-schievink
Copy link
Contributor

A point release won't affect beta, you have to use stable-nominated to get backports into point releases. Given that this isn't a regression and also a pretty old ICE, I don't know if that's a good idea, but that's for T-compiler to decide.

@bors

This comment has been minimized.

Sign in to view
@RalfJung RalfJung mentioned this pull request Jun 8, 2019
Closed
@rust-highfive

This comment has been minimized.

Sign in to view
@RalfJung

This comment has been minimized.

Sign in to view
estebank
estebank commented Jun 12, 2019
View reviewed changes
src/test/ui/consts/array-literal-index-oob.stderr
| |
| index out of bounds: the len is 3 but the index is 4

error: aborting due to 3 previous errors
Copy link
Contributor Author

Choose a reason for hiding this comment

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

It seems to me like we could deduplicate these errors :)

@jonas-schievink jonas-schievink added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jun 12, 2019
@RalfJung
Copy link
Member

LGTM!

@oli-obk
Copy link
Contributor

oli-obk commented Jun 13, 2019

@bors r+

@bors
Copy link
Contributor

bors commented Jun 13, 2019

📌 Commit ef6240a 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 Jun 13, 2019
@oli-obk
Copy link
Contributor

oli-obk commented Jun 13, 2019

r? @oli-obk

@rust-highfive rust-highfive assigned oli-obk and unassigned pnkfelix Jun 13, 2019
Centril added a commit to Centril/rust that referenced this pull request Jun 13, 2019
@Centril
Rollup merge of rust-lang#61598 - estebank:const-idx, r=oli-obk
a0d0515 
Handle index out of bound errors during const eval without panic

Fix rust-lang#61595
@Centril Centril mentioned this pull request Jun 13, 2019
Merged
bors added a commit that referenced this pull request Jun 13, 2019
@bors
Auto merge of #61799 - Centril:rollup-vpm5uxr, r=Centril
57a3300 
Rollup of 5 pull requests

Successful merges:

 - #61598 (Handle index out of bound errors during const eval without panic)
 - #61720 (std: Remove internal definitions of `cfg_if!` macro)
 - #61757 (Deprecate ONCE_INIT in future 1.38 release)
 - #61766 (submodules: update clippy from c0dbd34 to bd33a97)
 - #61791 (Small cleanup in `check_pat_path`)

Failed merges:

r? @ghost
@pnkfelix
Copy link
Member

discussed at compiler team meeting. Approved for backport to beta branch.

@pnkfelix pnkfelix added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jun 13, 2019
@bors bors merged commit ef6240a into rust-lang:master Jun 13, 2019
@estebank estebank mentioned this pull request Jun 14, 2019
Closed
@pietroalbini pietroalbini mentioned this pull request Jun 22, 2019
Merged
@pietroalbini pietroalbini removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jun 22, 2019
bors added a commit that referenced this pull request Jun 26, 2019
@bors
Auto merge of #62065 - pietroalbini:beta-rollup, r=Mark-Simulacrum
83167c4 
[beta] Rollup backports

Rolled up:

* [beta] Comment out dev key #61700

Cherry picked:

* Dont ICE on an attempt to use GAT without feature gate #61118
* Fix cfg(test) build for x86_64-fortanix-unknown-sgx #61503
* Handle index out of bound errors during const eval without panic #61598
* Hygienize macros in the standard library #61629
* Fix ICE involving mut references #61947
* rustc_typeck: correctly compute `Substs` for `Res::SelfCtor`. #61896
* Revert "Set test flag when rustdoc is running with --test option" #61199
* create a "provisional cache" to restore performance in the case of cycles #61754

r? @ghost
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oli-obk oli-obk oli-obk left review comments

@RalfJung RalfJung RalfJung left review comments

Assignees

@oli-obk oli-obk

Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. 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
No milestone
Development

Successfully merging this pull request may close these issues.

ICE with index out of bounds const_err
8 participants
@estebank @rust-highfive @jonas-schievink @bors @RalfJung @oli-obk @pnkfelix @pietroalbini