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

Use track_errors instead of hand rolling #59358

Merged
merged 7 commits into from
Mar 29, 2019
Merged

Use track_errors instead of hand rolling #59358

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3ba7454
Use track_errors
JohnTitor Mar 21, 2019
526b355
Remove err_count
JohnTitor Mar 22, 2019
ee0e1b7
Set ok value
JohnTitor Mar 22, 2019
0e76b34
WIP: remove report_as_error
JohnTitor Mar 24, 2019
f0de8e8
Return correct values
JohnTitor Mar 24, 2019
6c8e3a5
Remove unused variable
JohnTitor Mar 24, 2019
0778847
Use ErrorReported
JohnTitor Mar 28, 2019
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
18 changes: 12 additions & 6 deletions src/librustc_mir/const_eval.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ use rustc::ty::{self, TyCtxt, query::TyCtxtAt};
use rustc::ty::layout::{self, LayoutOf, VariantIdx};
use rustc::ty::subst::Subst;
use rustc::traits::Reveal;
use rustc::util::common::ErrorReported;
use rustc_data_structures::fx::FxHashMap;

use syntax::ast::Mutability;
Expand Down Expand Up @@ -641,16 +642,21 @@ pub fn const_eval_raw_provider<'a, 'tcx>(
let err = error_to_const_error(&ecx, error);
// errors in statics are always emitted as fatal errors
if tcx.is_static(def_id).is_some() {
let reported_err = err.report_as_error(ecx.tcx,
"could not evaluate static initializer");
// Ensure that if the above error was either `TooGeneric` or `Reported`
// an error must be reported.
if tcx.sess.err_count() == 0 {
tcx.sess.delay_span_bug(err.span,
let reported_err = tcx.sess.track_errors(|| {
err.report_as_error(ecx.tcx,
"could not evaluate static initializer")
});
match reported_err {
Ok(v) => {
tcx.sess.delay_span_bug(err.span,
&format!("static eval failure did not emit an error: {:#?}",
reported_err));
v));
v
},
Err(ErrorReported) => ErrorHandled::Reported,
}
reported_err
} else if def_id.is_local() {
// constant defined in this crate, we can figure out a lint level!
match tcx.describe_def(def_id) {
Expand Down