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

rustc_mir: fix miri substitution/"universe" discipline. #63497

Merged
merged 10 commits into from
Aug 20, 2019

Conversation

eddyb
Copy link
Member

@eddyb eddyb commented Aug 12, 2019

Alternative to #61041, based on @RalfJung's own attempt at it.
I haven't done a full audit, but I believe everything is fixed now.

Fixes #61432.
Closes #61336, as a drive-by fix (for a subset of #43408, that is already special-cased).

r? @oli-obk / @RalfJung cc @varkor @yodaldevoid

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 12, 2019
@eddyb

This comment has been minimized.

@RalfJung
Copy link
Member

I can confirm that this fixes the test-case in rust-lang/miri#837 :)

@bors

This comment has been minimized.

@RalfJung
Copy link
Member

@eddyb the base PR landed, so after a rebase this should be ready for review. :)

@RalfJung RalfJung added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 17, 2019
@eddyb eddyb added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 18, 2019
@oli-obk
Copy link
Contributor

oli-obk commented Aug 18, 2019

Also fixes #61432, please add the test case from the issue.

After my nit our PRs should be synchronized, I just stepped through their diffs and I'd rather merge this PR since it's diff is cleaner

@eddyb
Copy link
Member Author

eddyb commented Aug 19, 2019

@oli-obk Should be good to go now, thanks!

@oli-obk
Copy link
Contributor

oli-obk commented Aug 20, 2019

@bors r+

@bors
Copy link
Contributor

bors commented Aug 20, 2019

📌 Commit 96fc989 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 Aug 20, 2019
Centril added a commit to Centril/rust that referenced this pull request Aug 20, 2019
rustc_mir: fix miri substitution/"universe" discipline.

Alternative to rust-lang#61041, based on @RalfJung's own attempt at it.
I haven't done a full audit, but I believe everything is fixed now.

Fixes rust-lang#61432.
Closes rust-lang#61336, as a drive-by fix (for a subset of rust-lang#43408, that is already special-cased).

r? @oli-obk / @RalfJung cc @varkor @yodaldevoid
@bors
Copy link
Contributor

bors commented Aug 20, 2019

⌛ Testing commit 96fc989 with merge 7858dc2...

bors added a commit that referenced this pull request Aug 20, 2019
rustc_mir: fix miri substitution/"universe" discipline.

Alternative to #61041, based on @RalfJung's own attempt at it.
I haven't done a full audit, but I believe everything is fixed now.

Fixes #61432.
Closes #61336, as a drive-by fix (for a subset of #43408, that is already special-cased).

r? @oli-obk / @RalfJung cc @varkor @yodaldevoid
@bors
Copy link
Contributor

bors commented Aug 20, 2019

☀️ Test successful - checks-azure
Approved by: oli-obk
Pushing 7858dc2 to master...

|
= note: the method `HOST_SIZE` exists but the following trait bounds were not satisfied:
`A : std::marker::Sized`
`B : std::marker::Sized`
Copy link
Member

Choose a reason for hiding this comment

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

Those trait bounds are implicit when not using : ?Sized right?

Copy link
Contributor

Choose a reason for hiding this comment

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

that's a different bug. This regression test is to prevent the ICE from recurring. The fact that what's done in the test is unsupported by rustc is likely lazy normalization (allowing array length constants to refer to generics of the surrounding scope)

Copy link
Contributor

Choose a reason for hiding this comment

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

(And it should stay unsupported on stable without T-Lang approval.)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
F-const_generics `#![feature(const_generics)]` 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.
Projects
None yet
8 participants