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

valtree: a bit of cleanup

Browse Source
This commit is contained in:
Ralf Jung 2023-07-26 11:14:27 +02:00
parent da3f0d0eb7
commit 571e8ce777
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
compiler/rustc_const_eval/src/const_eval/valtrees.rs
View File

@ -5,7 +5,7 @@
use crate::interpret::MPlaceTy; use crate::interpret::MPlaceTy;
use crate::interpret::{ use crate::interpret::{
intern_const_alloc_recursive, ConstValue, ImmTy, Immediate, InternKind, MemPlaceMeta, intern_const_alloc_recursive, ConstValue, ImmTy, Immediate, InternKind, MemPlaceMeta,
MemoryKind, PlaceTy, Projectable, Scalar, MemoryKind, Place, Projectable, Scalar,
}; };
use rustc_middle::ty::{self, ScalarInt, Ty, TyCtxt}; use rustc_middle::ty::{self, ScalarInt, Ty, TyCtxt};
use rustc_span::source_map::DUMMY_SP; use rustc_span::source_map::DUMMY_SP;
@ -280,7 +280,7 @@ pub fn valtree_to_const_value<'tcx>(
), ),
}, },
ty::Ref(_, _, _) | ty::Tuple(_) | ty::Array(_, _) | ty::Adt(..) => { ty::Ref(_, _, _) | ty::Tuple(_) | ty::Array(_, _) | ty::Adt(..) => {
let mut place = match ty.kind() { let place = match ty.kind() {
ty::Ref(_, inner_ty, _) => { ty::Ref(_, inner_ty, _) => {
// Need to create a place for the pointee to fill for Refs // Need to create a place for the pointee to fill for Refs
create_pointee_place(&mut ecx, *inner_ty, valtree) create_pointee_place(&mut ecx, *inner_ty, valtree)
@ -289,8 +289,8 @@ pub fn valtree_to_const_value<'tcx>(
}; };
debug!(?place); debug!(?place);
valtree_into_mplace(&mut ecx, &mut place, valtree); valtree_into_mplace(&mut ecx, &place, valtree);
dump_place(&ecx, place.clone().into()); dump_place(&ecx, &place);
intern_const_alloc_recursive(&mut ecx, InternKind::Constant, &place).unwrap(); intern_const_alloc_recursive(&mut ecx, InternKind::Constant, &place).unwrap();
match ty.kind() { match ty.kind() {
@ -329,7 +329,7 @@ pub fn valtree_to_const_value<'tcx>(
#[instrument(skip(ecx), level = "debug")] #[instrument(skip(ecx), level = "debug")]
fn valtree_into_mplace<'tcx>( fn valtree_into_mplace<'tcx>(
ecx: &mut CompileTimeEvalContext<'tcx, 'tcx>, ecx: &mut CompileTimeEvalContext<'tcx, 'tcx>,
place: &mut MPlaceTy<'tcx>, place: &MPlaceTy<'tcx>,
valtree: ty::ValTree<'tcx>, valtree: ty::ValTree<'tcx>,
) { ) {
// This will match on valtree and write the value(s) corresponding to the ValTree // This will match on valtree and write the value(s) corresponding to the ValTree
@ -348,11 +348,11 @@ fn valtree_into_mplace<'tcx>(
ecx.write_immediate(Immediate::Scalar(scalar_int.into()), place).unwrap(); ecx.write_immediate(Immediate::Scalar(scalar_int.into()), place).unwrap();
} }
ty::Ref(_, inner_ty, _) => { ty::Ref(_, inner_ty, _) => {
let mut pointee_place = create_pointee_place(ecx, *inner_ty, valtree); let pointee_place = create_pointee_place(ecx, *inner_ty, valtree);
debug!(?pointee_place); debug!(?pointee_place);
valtree_into_mplace(ecx, &mut pointee_place, valtree); valtree_into_mplace(ecx, &pointee_place, valtree);
dump_place(ecx, pointee_place.clone().into()); dump_place(ecx, &pointee_place);
intern_const_alloc_recursive(ecx, InternKind::Constant, &pointee_place).unwrap(); intern_const_alloc_recursive(ecx, InternKind::Constant, &pointee_place).unwrap();
let imm = match inner_ty.kind() { let imm = match inner_ty.kind() {
@ -398,7 +398,7 @@ fn valtree_into_mplace<'tcx>(
for (i, inner_valtree) in branches.iter().enumerate() { for (i, inner_valtree) in branches.iter().enumerate() {
debug!(?i, ?inner_valtree); debug!(?i, ?inner_valtree);
let mut place_inner = match ty.kind() { let place_inner = match ty.kind() {
ty::Str | ty::Slice(_) => ecx.project_index(place, i as u64).unwrap(), ty::Str | ty::Slice(_) => ecx.project_index(place, i as u64).unwrap(),
_ if !ty.is_sized(*ecx.tcx, ty::ParamEnv::empty()) _ if !ty.is_sized(*ecx.tcx, ty::ParamEnv::empty())
&& i == branches.len() - 1 => && i == branches.len() - 1 =>
@ -443,12 +443,12 @@ fn valtree_into_mplace<'tcx>(
}; };
debug!(?place_inner); debug!(?place_inner);
valtree_into_mplace(ecx, &mut place_inner, *inner_valtree); valtree_into_mplace(ecx, &place_inner, *inner_valtree);
dump_place(&ecx, place_inner.into()); dump_place(&ecx, &place_inner);
} }
debug!("dump of place_adjusted:"); debug!("dump of place_adjusted:");
dump_place(ecx, place_adjusted.into()); dump_place(ecx, &place_adjusted);
if let Some(variant_idx) = variant_idx { if let Some(variant_idx) = variant_idx {
// don't forget filling the place with the discriminant of the enum // don't forget filling the place with the discriminant of the enum
@ -456,12 +456,12 @@ fn valtree_into_mplace<'tcx>(
} }
debug!("dump of place after writing discriminant:"); debug!("dump of place after writing discriminant:");
dump_place(ecx, place.clone().into()); dump_place(ecx, place);
} }
_ => bug!("shouldn't have created a ValTree for {:?}", ty), _ => bug!("shouldn't have created a ValTree for {:?}", ty),
} }
} }
fn dump_place<'tcx>(ecx: &CompileTimeEvalContext<'tcx, 'tcx>, place: PlaceTy<'tcx>) { fn dump_place<'tcx>(ecx: &CompileTimeEvalContext<'tcx, 'tcx>, place: &MPlaceTy<'tcx>) {
trace!("{:?}", ecx.dump_place(*place)); trace!("{:?}", ecx.dump_place(Place::Ptr(**place)));
} }