include valtree creation and valtree -> constvalue conversion in debug assertions check

2 files changed, 30 insertions, 31 deletions

diff --git a/compiler/rustc_const_eval/src/const_eval/eval_queries.rs b/compiler/rustc_const_eval/src/const_eval/eval_queries.rs
index 38fecf7232e..52b65c41b4f 100644
--- a/compiler/rustc_const_eval/src/const_eval/eval_queries.rs
+++ b/compiler/rustc_const_eval/src/const_eval/eval_queries.rs
@@ -1,4 +1,4 @@
-use super::{CompileTimeEvalContext, CompileTimeInterpreter, ConstEvalErr};
+use super::{const_to_valtree, CompileTimeEvalContext, CompileTimeInterpreter, ConstEvalErr};
 use crate::interpret::eval_nullary_intrinsic;
 use crate::interpret::{
     intern_const_alloc_recursive, Allocation, ConstAlloc, ConstValue, CtfeValidationMode, GlobalId,
@@ -215,6 +215,13 @@ fn turn_into_const_value<'tcx>(
         "the `eval_to_const_value_raw` query should not be used for statics, use `eval_to_allocation` instead"
     );
 
+    if cfg!(debug_assertions) {
+        if let Some(valtree) = const_to_valtree(tcx, key.param_env, constant) {
+            let const_val = tcx.valtree_to_const_val((constant.ty, valtree));
+            debug!(?const_val);
+        }
+    }
+
     // Turn this into a proper constant.
     let const_val = op_to_const(&ecx, &mplace.into());
     debug!(?const_val);
diff --git a/compiler/rustc_const_eval/src/const_eval/valtrees.rs b/compiler/rustc_const_eval/src/const_eval/valtrees.rs
index 39a3df79a28..f35b28e187a 100644
--- a/compiler/rustc_const_eval/src/const_eval/valtrees.rs
+++ b/compiler/rustc_const_eval/src/const_eval/valtrees.rs
@@ -5,7 +5,6 @@ use crate::interpret::{
     Scalar, ScalarMaybeUninit,
 };
 use rustc_middle::mir::interpret::ConstAlloc;
-use rustc_middle::mir::{Field, ProjectionElem};
 use rustc_middle::ty::{self, ScalarInt, Ty, TyCtxt};
 use rustc_span::source_map::DUMMY_SP;
 use rustc_target::abi::VariantIdx;
@@ -197,45 +196,45 @@ pub fn valtree_to_const_value<'tcx>(
     let mut ecx = mk_eval_cx(tcx, DUMMY_SP, param_env, false);
 
     match ty.kind() {
+        ty::FnDef(..) => {
+            assert!(valtree.unwrap_branch().is_empty());
+            ConstValue::Scalar(Scalar::ZST)
+        }
         ty::Bool | ty::Int(_) | ty::Uint(_) | ty::Float(_) | ty::Char => match valtree {
             ty::ValTree::Leaf(scalar_int) => ConstValue::Scalar(Scalar::Int(scalar_int)),
             ty::ValTree::Branch(_) => bug!(
                 "ValTrees for Bool, Int, Uint, Float or Char should have the form ValTree::Leaf"
             ),
         },
-        ty::Ref(_, inner_ty, _) => {
-            // create a place for the pointee
-            let mut pointee_place = create_pointee_place(&mut ecx, *inner_ty, valtree);
-            debug!(?pointee_place);
-
-            // insert elements of valtree into `place`
-            fill_place_recursively(&mut ecx, &mut pointee_place, valtree);
-            dump_place(&ecx, pointee_place.into());
-            intern_const_alloc_recursive(&mut ecx, InternKind::Constant, &pointee_place).unwrap();
-
-            let ref_place = pointee_place.to_ref(&tcx);
-            let imm = ImmTy::from_immediate(ref_place, tcx.layout_of(param_env_ty).unwrap());
-
-            let const_val = op_to_const(&ecx, &imm.into());
-            debug!(?const_val);
-
-            const_val
-        }
-        ty::Tuple(_) | ty::Array(_, _) | ty::Adt(..) => {
-            let mut place = create_mplace_from_layout(&mut ecx, ty);
+        ty::Ref(_, _, _) | ty::Tuple(_) | ty::Array(_, _) | ty::Adt(..) => {
+            let mut place = match ty.kind() {
+                ty::Ref(_, inner_ty, _) => {
+                    // Need to create a place for the pointee to fill for Refs
+                    create_pointee_place(&mut ecx, *inner_ty, valtree)
+                }
+                _ => create_mplace_from_layout(&mut ecx, ty),
+            };
             debug!(?place);
 
             fill_place_recursively(&mut ecx, &mut place, valtree);
             dump_place(&ecx, place.into());
             intern_const_alloc_recursive(&mut ecx, InternKind::Constant, &place).unwrap();
 
-            let const_val = op_to_const(&ecx, &place.into());
+            let const_val = match ty.kind() {
+                ty::Ref(_, _, _) => {
+                    let ref_place = place.to_ref(&tcx);
+                    let imm =
+                        ImmTy::from_immediate(ref_place, tcx.layout_of(param_env_ty).unwrap());
+
+                    op_to_const(&ecx, &imm.into())
+                }
+                _ => op_to_const(&ecx, &place.into()),
+            };
             debug!(?const_val);
 
             const_val
         }
         ty::Never
-        | ty::FnDef(..)
         | ty::Error(_)
         | ty::Foreign(..)
         | ty::Infer(ty::FreshIntTy(_))
@@ -331,13 +330,6 @@ fn fill_place_recursively<'tcx>(
                 debug!(?i, ?inner_valtree);
 
                 let mut place_inner = match *ty.kind() {
-                    ty::Adt(def, substs) if !def.is_enum() => {
-                        let field = &def.variant(VariantIdx::from_usize(0)).fields[i];
-                        let field_ty = field.ty(tcx, substs);
-                        let projection_elem = ProjectionElem::Field(Field::from_usize(i), field_ty);
-
-                        ecx.mplace_projection(&place_adjusted, projection_elem).unwrap()
-                    }
                     ty::Adt(_, _) | ty::Tuple(_) => ecx.mplace_field(&place_adjusted, i).unwrap(),
                     ty::Array(_, _) | ty::Str => {
                         ecx.mplace_index(&place_adjusted, i as u64).unwrap()