mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Split eval_to_allocation_raw_provider

Browse Source
This commit is contained in:
Oli Scherer 2023-10-10 08:35:39 +00:00
parent f85b139704
commit fec0b54978
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
compiler/rustc_const_eval/src/const_eval/eval_queries.rs
View File

@ -285,7 +285,7 @@ pub fn eval_to_allocation_raw_provider<'tcx>(
let def = cid.instance.def.def_id(); let def = cid.instance.def.def_id();
let is_static = tcx.is_static(def); let is_static = tcx.is_static(def);
let mut ecx = InterpCx::new( let ecx = InterpCx::new(
tcx, tcx,
tcx.def_span(def), tcx.def_span(def),
key.param_env, key.param_env,
@ -293,7 +293,14 @@ pub fn eval_to_allocation_raw_provider<'tcx>(
// they do not have to behave "as if" they were evaluated at runtime. // they do not have to behave "as if" they were evaluated at runtime.
CompileTimeInterpreter::new(CanAccessStatics::from(is_static), CheckAlignment::Error), CompileTimeInterpreter::new(CanAccessStatics::from(is_static), CheckAlignment::Error),
); );
eval_in_interpreter(ecx, cid, is_static)
}
pub fn eval_in_interpreter<'mir, 'tcx>(
mut ecx: InterpCx<'mir, 'tcx, CompileTimeInterpreter<'mir, 'tcx>>,
cid: GlobalId<'tcx>,
is_static: bool,
) -> ::rustc_middle::mir::interpret::EvalToAllocationRawResult<'tcx> {
let res = ecx.load_mir(cid.instance.def, cid.promoted); let res = ecx.load_mir(cid.instance.def, cid.promoted);
match res.and_then(|body| eval_body_using_ecx(&mut ecx, cid, &body)) { match res.and_then(|body| eval_body_using_ecx(&mut ecx, cid, &body)) {
Err(error) => { Err(error) => {
@ -306,7 +313,7 @@ pub fn eval_to_allocation_raw_provider<'tcx>(
// If the current item has generics, we'd like to enrich the message with the // If the current item has generics, we'd like to enrich the message with the
// instance and its args: to show the actual compile-time values, in addition to // instance and its args: to show the actual compile-time values, in addition to
// the expression, leading to the const eval error. // the expression, leading to the const eval error.
let instance = &key.value.instance; let instance = &cid.instance;
if !instance.args.is_empty() { if !instance.args.is_empty() {
let instance = with_no_trimmed_paths!(instance.to_string()); let instance = with_no_trimmed_paths!(instance.to_string());
("const_with_path", instance) ("const_with_path", instance)