bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

use body.tainted_by_error to skip loading MIR

Browse source
This commit is contained in:
Michael Goulet 2022-02-07 22:21:23 -08:00
parent a431174c23
commit 67ad0ffdf8
6 changed files with 21 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

23
compiler/rustc_const_eval/src/const_eval/eval_queries.rs
View file

@ -6,7 +6,6 @@ use crate::interpret::{
ScalarMaybeUninit, StackPopCleanup,
};
use rustc_errors::ErrorReported;
use rustc_hir::def::DefKind;
use rustc_middle::mir;
use rustc_middle::mir::interpret::ErrorHandled;
@ -281,28 +280,6 @@ pub fn eval_to_allocation_raw_provider<'tcx>(
let cid = key.value;
let def = cid.instance.def.with_opt_param();
if let Some(def) = def.as_local() {
if tcx.has_typeck_results(def.did) {
if let Some(error_reported) = tcx.typeck_opt_const_arg(def).tainted_by_errors {
return Err(ErrorHandled::Reported(error_reported));
}
if let Some(error_reported) = tcx.mir_borrowck_opt_const_arg(def).tainted_by_errors {
return Err(ErrorHandled::Reported(error_reported));
}
}
if !tcx.is_mir_available(def.did) {
tcx.sess.delay_span_bug(
tcx.def_span(def.did),
&format!("no MIR body is available for {:?}", def.did),
);
return Err(ErrorHandled::Reported(ErrorReported {}));
}
if let Some(error_reported) = tcx.mir_const_qualif_opt_const_arg(def).error_occured {
return Err(ErrorHandled::Reported(error_reported));
}
}
let is_static = tcx.is_static(def.did);
let mut ecx = InterpCx::new(