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

Remove check_match from const_eval #59781

Merged
merged 2 commits into from
Apr 13, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 3 additions & 16 deletions src/librustc_mir/const_eval.rs
Original file line number Diff line number Diff line change
Expand Up @@ -615,22 +615,9 @@ pub fn const_eval_raw_provider<'a, 'tcx>(
let cid = key.value;
let def_id = cid.instance.def.def_id();

if let Some(id) = tcx.hir().as_local_hir_id(def_id) {
let tables = tcx.typeck_tables_of(def_id);

// Do match-check before building MIR
// FIXME(#59378) check_match may have errored but we're not checking for that anymore
tcx.check_match(def_id);

if let hir::BodyOwnerKind::Const = tcx.hir().body_owner_kind_by_hir_id(id) {
tcx.mir_const_qualif(def_id);
}

// Do not continue into miri if typeck errors occurred; it will fail horribly
Copy link
Member

Choose a reason for hiding this comment

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

Might be worth preserving this comment.

if tables.tainted_by_errors {
return Err(ErrorHandled::Reported)
}
};
if def_id.is_local() && tcx.typeck_tables_of(def_id).tainted_by_errors {
return Err(ErrorHandled::Reported);
}

let (res, ecx) = eval_body_and_ecx(tcx, cid, None, key.param_env);
res.and_then(|place| {
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/issues/issue-23302-1.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ LL | A = X::A as isize,
| ^^^^^^^^^^^^^
|
= note: ...which again requires processing `X::A::{{constant}}#0`, completing the cycle
note: cycle used when const-evaluating `X::A::{{constant}}#0`
note: cycle used when processing `X::A::{{constant}}#0`
--> $DIR/issue-23302-1.rs:4:9
|
LL | A = X::A as isize,
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/issues/issue-23302-2.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ LL | A = Y::B as isize,
| ^^^^^^^^^^^^^
|
= note: ...which again requires processing `Y::A::{{constant}}#0`, completing the cycle
note: cycle used when const-evaluating `Y::A::{{constant}}#0`
note: cycle used when processing `Y::A::{{constant}}#0`
--> $DIR/issue-23302-2.rs:4:9
|
LL | A = Y::B as isize,
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/issues/issue-36163.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ note: ...which requires processing `A`...
LL | const A: isize = Foo::B as isize;
| ^^^^^^^^^^^^^^^
= note: ...which again requires processing `Foo::B::{{constant}}#0`, completing the cycle
note: cycle used when const-evaluating `Foo::B::{{constant}}#0`
note: cycle used when processing `Foo::B::{{constant}}#0`
--> $DIR/issue-36163.rs:4:9
|
LL | B = A,
Expand Down
1 change: 0 additions & 1 deletion src/test/ui/issues/issue-51714.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,4 @@ fn main() {

[(); return while let Some(n) = Some(0) {}];
//~^ ERROR return statement outside of function body
//~^^ WARN irrefutable while-let pattern
}
8 changes: 0 additions & 8 deletions src/test/ui/issues/issue-51714.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,6 @@ error[E0572]: return statement outside of function body
LL | [(); return while let Some(n) = Some(0) {}];
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

warning: irrefutable while-let pattern
Copy link
Contributor

Choose a reason for hiding this comment

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

Now that I think of it.... This is actually a diagnostics improvement. This now-removed diagnostic is just plain wrong.

--> $DIR/issue-51714.rs:11:17
|
LL | [(); return while let Some(n) = Some(0) {}];
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= note: #[warn(irrefutable_let_patterns)] on by default

error: aborting due to 4 previous errors

For more information about this error, try `rustc --explain E0572`.