Skip to content

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

Merged
bors merged 1 commit into
rust-lang:masterfrom
estebank:const-idx
Jun 13, 2019
Merged

Handle index out of bound errors during const eval without panic#61598
bors merged 1 commit into
rust-lang:masterfrom
estebank:const-idx

Conversation

@estebank

@estebankestebank commented Jun 6, 2019

Copy link
Copy Markdown
Contributor

@rust-highfive

rust-highfive commented Jun 6, 2019

Copy link
Copy Markdown
Contributor

r? @pnkfelix

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

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

estebank commented Jun 6, 2019•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

cc @RalfJung@varkor@oli-obk

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

estebank commented Jun 6, 2019•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

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

jonas-schievink commented Jun 6, 2019

Copy link
Copy Markdown
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.

oli-obk
oli-obk reviewed Jun 7, 2019
View reviewed changes
Comment threadsrc/librustc_mir/interpret/place.rs Outdated
RalfJung
RalfJung reviewed Jun 7, 2019
View reviewed changes
Comment threadsrc/librustc_mir/interpret/place.rs Outdated
RalfJung
RalfJung reviewed Jun 7, 2019
View reviewed changes
Comment threadsrc/test/ui/consts/array-literal-index-oob.stderr Outdated
@bors

This comment has been minimized.

Sign in to view
@RalfJungRalfJung 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
Comment threadsrc/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

@estebankestebankJun 12, 2019

Copy link
Copy Markdown
ContributorAuthor

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-schievinkjonas-schievink added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jun 12, 2019
@RalfJung

RalfJung commented Jun 12, 2019

Copy link
Copy Markdown
Member

LGTM!

@oli-obk

oli-obk commented Jun 13, 2019

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Jun 13, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit ef6240a has been approved by oli-obk

@borsbors 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

oli-obk commented Jun 13, 2019

Copy link
Copy Markdown
Contributor

r? @oli-obk

Centril added a commit to Centril/rust that referenced this pull request Jun 13, 2019
@Centril
Rollup merge ofrust-lang#61598- estebank:const-idx, r=oli-obk
a0d0515
Handle index out of bound errors during const eval without panic
Fixrust-lang#61595
@CentrilCentril 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

pnkfelix commented Jun 13, 2019

Copy link
Copy Markdown
Contributor

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

@pnkfelixpnkfelix 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:masterJun 13, 2019
@estebankestebank mentioned this pull request Jun 14, 2019
Closed
@emilyalbiniemilyalbini mentioned this pull request Jun 22, 2019
Merged
@emilyalbiniemilyalbini 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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@RalfJungRalfJungRalfJung left review comments
@oli-obkoli-obkoli-obk left review comments

Assignees

@oli-obkoli-obk

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant 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@emilyalbini