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

Continue evaluating after missing main #59903

Merged
merged 1 commit into from
Apr 16, 2019
Merged

Conversation

estebank
Copy link
Contributor

No description provided.

@rust-highfive
Copy link
Collaborator

r? @oli-obk

(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 Apr 12, 2019
@@ -939,7 +940,10 @@ fn analysis<'tcx>(

// Abort so we don't try to construct MIR with liveness errors.
// We also won't want to continue with errors from rvalue promotion
Copy link
Contributor

Choose a reason for hiding this comment

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

well, we actually want to, but that's not really a problem of this PR. Have you checked how bad the fallout is if we remove this abort_if_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.

I believe that there were some useless errors coming from const evaluation, but those might have come from removing the later check at https://github.com/rust-lang/rust/pull/59903/files/13a05a27e9a5747cad090b1670c0a6b0baa624b9#diff-24c5c945888bb0d041e769bfb852de6cR976

Copy link
Contributor

Choose a reason for hiding this comment

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

Can you check? I'd rather remove it entirely. Const eval should not evaluate MIR with typeck errors or borrowck 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.

@oli-obk most of the extra errors are not too bad, but src/test/ui/consts/match_ice.rs starts ICEing again. I'll need to dig deeper to fix the ICE and would like to remove the duplicated errors/warnings before merging that change, but it is certainly doable.

Copy link
Contributor

Choose a reason for hiding this comment

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

Hmm... Those look like deeper issues to me where some things should be querified more or just produce dummy values in case of errors. Please open an issue linking to the fallout of 8395dbd and mentioning the problems.

@oli-obk
Copy link
Contributor

oli-obk commented Apr 15, 2019

@bors r+

We'll do the full fix later, needs some investigation

@bors
Copy link
Contributor

bors commented Apr 15, 2019

📌 Commit 13a05a2 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 Apr 15, 2019
Centril added a commit to Centril/rust that referenced this pull request Apr 15, 2019
Continue evaluating after missing main
@estebank
Copy link
Contributor Author

@oli-obk, made one further change in a separate branch that gets rid of the ICE, but I'm not sure it is the right solution.

Centril added a commit to Centril/rust that referenced this pull request Apr 16, 2019
Continue evaluating after missing main
Centril added a commit to Centril/rust that referenced this pull request Apr 16, 2019
Continue evaluating after missing main
bors added a commit that referenced this pull request Apr 16, 2019
Rollup of 6 pull requests

Successful merges:

 - #59717 (improve docs for std::hint::unreachable_unchecked())
 - #59903 (Continue evaluating after missing main)
 - #59973 (Fix rustdoc sidebar z-index)
 - #59992 (rustdoc: use --static-root-path for settings.js)
 - #59993 (include mode in unused binding suggestion span)
 - #60000 (Add repo-specific triagebot configuration)

Failed merges:

r? @ghost
@bors bors merged commit 13a05a2 into rust-lang:master Apr 16, 2019
bors added a commit that referenced this pull request Apr 23, 2019
Don't stop evaluating due to errors before borrow checking

r? @oli-obk

Fix #60005. Follow up to #59903. Blocked on #53708, fixing the ICE in `src/test/ui/consts/match_ice.rs`.
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.

4 participants