bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Specify diagnostic path.

Browse source
This commit is contained in:
Camille GILLOT 2023-11-01 18:36:38 +00:00
parent 0f8f77fcc2
commit 224e29030a
3 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -110,6 +110,7 @@ pub(crate) fn mk_eval_cx<'mir, 'tcx>(
pub(super) fn op_to_const<'tcx>( pub(super) fn op_to_const<'tcx>(
ecx: &CompileTimeEvalContext<'_, 'tcx>, ecx: &CompileTimeEvalContext<'_, 'tcx>,
op: &OpTy<'tcx>, op: &OpTy<'tcx>,
for_diagnostics: bool,
) -> ConstValue<'tcx> { ) -> ConstValue<'tcx> {
// Handle ZST consistently and early. // Handle ZST consistently and early.
if op.layout.is_zst() { if op.layout.is_zst() {
@ -132,8 +133,14 @@ pub(super) fn op_to_const<'tcx>(
// functionality.) // functionality.)
_ => false, _ => false,
}; };
let immediate = if force_as_immediate && let Ok(imm) = ecx.read_immediate(op) { let immediate = if force_as_immediate {
Right(imm) match ecx.read_immediate(op) {
Ok(imm) => Right(imm),
Err(err) if !for_diagnostics => {
panic!("normalization works on validated constants: {err:?}")
}
_ => op.as_mplace_or_imm(),
}
} else { } else {
op.as_mplace_or_imm() op.as_mplace_or_imm()
}; };
@ -205,7 +212,7 @@ pub(crate) fn turn_into_const_value<'tcx>(
); );
// Turn this into a proper constant. // Turn this into a proper constant.
op_to_const(&ecx, &mplace.into()) op_to_const(&ecx, &mplace.into(), /* for diagnostics */ false)
} }
#[instrument(skip(tcx), level = "debug")] #[instrument(skip(tcx), level = "debug")]

2
compiler/rustc_const_eval/src/const_eval/mod.rs
View file

@ -99,7 +99,7 @@ pub(crate) fn try_destructure_mir_constant_for_user_output<'tcx>(
let fields_iter = (0..field_count) let fields_iter = (0..field_count)
.map(|i| { .map(|i| {
let field_op = ecx.project_field(&down, i).ok()?; let field_op = ecx.project_field(&down, i).ok()?;
let val = op_to_const(&ecx, &field_op); let val = op_to_const(&ecx, &field_op, /* for diagnostics */ true);
Some((val, field_op.layout.ty)) Some((val, field_op.layout.ty))
}) })
.collect::<Option<Vec<_>>>()?; .collect::<Option<Vec<_>>>()?;

4
compiler/rustc_const_eval/src/const_eval/valtrees.rs
View file

@ -232,7 +232,7 @@ pub fn valtree_to_const_value<'tcx>(
let mut ecx = mk_eval_cx(tcx, DUMMY_SP, param_env, CanAccessStatics::No); let mut ecx = mk_eval_cx(tcx, DUMMY_SP, param_env, CanAccessStatics::No);
let imm = valtree_to_ref(&mut ecx, valtree, *inner_ty); let imm = valtree_to_ref(&mut ecx, valtree, *inner_ty);
let imm = ImmTy::from_immediate(imm, tcx.layout_of(param_env_ty).unwrap()); let imm = ImmTy::from_immediate(imm, tcx.layout_of(param_env_ty).unwrap());
op_to_const(&ecx, &imm.into()) op_to_const(&ecx, &imm.into(), /* for diagnostics */ false)
} }
ty::Tuple(_) | ty::Array(_, _) | ty::Adt(..) => { ty::Tuple(_) | ty::Array(_, _) | ty::Adt(..) => {
let layout = tcx.layout_of(param_env_ty).unwrap(); let layout = tcx.layout_of(param_env_ty).unwrap();
@ -265,7 +265,7 @@ pub fn valtree_to_const_value<'tcx>(
dump_place(&ecx, &place); dump_place(&ecx, &place);
intern_const_alloc_recursive(&mut ecx, InternKind::Constant, &place).unwrap(); intern_const_alloc_recursive(&mut ecx, InternKind::Constant, &place).unwrap();
op_to_const(&ecx, &place.into()) op_to_const(&ecx, &place.into(), /* for diagnostics */ false)
} }
ty::Never ty::Never
| ty::Error(_) | ty::Error(_)