Move Const from rustc_middle to rustc_type_ir

Author: Jamesbarford

compiler/rustc_middle/src/ty/codec.rs

@@ -142,12 +142,6 @@ impl<'tcx, E: TyEncoder<'tcx>> Encodable<E> for ty::Clause<'tcx> {
     }
 }
 
-impl<'tcx, E: TyEncoder<'tcx>> Encodable<E> for ty::Const<'tcx> {
-    fn encode(&self, e: &mut E) {
-        self.0.0.encode(e);
-    }
-}
-
 impl<'tcx, E: TyEncoder<'tcx>> Encodable<E> for ty::Pattern<'tcx> {
     fn encode(&self, e: &mut E) {
         self.0.0.encode(e);
@@ -292,13 +286,6 @@ impl<'tcx, D: TyDecoder<'tcx>> Decodable<D> for ty::ParamEnv<'tcx> {
     }
 }
 
-impl<'tcx, D: TyDecoder<'tcx>> Decodable<D> for ty::Const<'tcx> {
-    fn decode(decoder: &mut D) -> Self {
-        let kind: ty::ConstKind<'tcx> = Decodable::decode(decoder);
-        decoder.interner().mk_ct_from_kind(kind)
-    }
-}
-
 impl<'tcx, D: TyDecoder<'tcx>> Decodable<D> for ty::Pattern<'tcx> {
     fn decode(decoder: &mut D) -> Self {
         decoder.interner().mk_pat(Decodable::decode(decoder))

compiler/rustc_middle/src/ty/consts.rs

@@ -1,10 +1,7 @@
-use std::borrow::Cow;
-
-use rustc_data_structures::intern::Interned;
-use rustc_macros::StableHash;
-use rustc_span::{Span, bug};
+use rustc_macros::extension;
+use rustc_span::bug;
 use rustc_type_ir::walk::TypeWalker;
-use rustc_type_ir::{self as ir, TypeFlags, WithCachedTypeInfo};
+use rustc_type_ir::{self as ir};
 
 use crate::mir::interpret::Scalar;
 use crate::ty::{self, Ty, TyCtxt};
@@ -17,204 +14,21 @@ mod valtree;
 pub use int::*;
 pub use kind::*;
 pub use lit::*;
-use rustc_span::{DUMMY_SP, ErrorGuaranteed};
 pub use valtree::*;
 
 pub type ConstKind<'tcx> = ir::ConstKind<TyCtxt<'tcx>>;
 pub type AliasConst<'tcx> = ir::AliasConst<TyCtxt<'tcx>>;
 pub type AliasConstKind<'tcx> = ir::AliasConstKind<TyCtxt<'tcx>>;
+pub type Const<'tcx> = ir::Const<TyCtxt<'tcx>>;
 
 #[cfg(target_pointer_width = "64")]
 rustc_data_structures::static_assert_size!(ConstKind<'_>, 32);
 
-#[derive(Copy, Clone, PartialEq, Eq, Hash, StableHash)]
-#[rustc_pass_by_value]
-pub struct Const<'tcx>(pub(super) Interned<'tcx, WithCachedTypeInfo<ConstKind<'tcx>>>);
-
-impl<'tcx> rustc_type_ir::inherent::IntoKind for Const<'tcx> {
-    type Kind = ConstKind<'tcx>;
-
-    fn kind(self) -> ConstKind<'tcx> {
-        self.kind()
-    }
-}
-
-impl<'tcx> rustc_type_ir::Flags for Const<'tcx> {
-    fn flags(&self) -> TypeFlags {
-        self.0.flags
-    }
-
-    fn outer_exclusive_binder(&self) -> rustc_type_ir::DebruijnIndex {
-        self.0.outer_exclusive_binder
-    }
-}
-
-impl<'tcx> Const<'tcx> {
-    #[inline]
-    pub fn kind(self) -> ConstKind<'tcx> {
-        let a: &ConstKind<'tcx> = self.0.0;
-        *a
-    }
-
-    #[inline]
-    pub fn new(tcx: TyCtxt<'tcx>, kind: ty::ConstKind<'tcx>) -> Const<'tcx> {
-        tcx.mk_ct_from_kind(kind)
-    }
-
-    #[inline]
-    pub fn new_param(tcx: TyCtxt<'tcx>, param: ty::ParamConst) -> Const<'tcx> {
-        Const::new(tcx, ty::ConstKind::Param(param))
-    }
-
-    #[inline]
-    pub fn new_var(tcx: TyCtxt<'tcx>, infer: ty::ConstVid) -> Const<'tcx> {
-        Const::new(tcx, ty::ConstKind::Infer(ty::InferConst::Var(infer)))
-    }
-
-    #[inline]
-    pub fn new_fresh(tcx: TyCtxt<'tcx>, fresh: u32) -> Const<'tcx> {
-        Const::new(tcx, ty::ConstKind::Infer(ty::InferConst::Fresh(fresh)))
-    }
-
-    #[inline]
-    pub fn new_infer(tcx: TyCtxt<'tcx>, infer: ty::InferConst) -> Const<'tcx> {
-        Const::new(tcx, ty::ConstKind::Infer(infer))
-    }
-
-    #[inline]
-    pub fn new_bound(
-        tcx: TyCtxt<'tcx>,
-        debruijn: ty::DebruijnIndex,
-        bound_const: ty::BoundConst<'tcx>,
-    ) -> Const<'tcx> {
-        Const::new(tcx, ty::ConstKind::Bound(ty::BoundVarIndexKind::Bound(debruijn), bound_const))
-    }
-
-    #[inline]
-    pub fn new_canonical_bound(tcx: TyCtxt<'tcx>, var: ty::BoundVar) -> Const<'tcx> {
-        Const::new(
-            tcx,
-            ty::ConstKind::Bound(ty::BoundVarIndexKind::Canonical, ty::BoundConst::new(var)),
-        )
-    }
-
-    #[inline]
-    pub fn new_placeholder(
-        tcx: TyCtxt<'tcx>,
-        placeholder: ty::PlaceholderConst<'tcx>,
-    ) -> Const<'tcx> {
-        Const::new(tcx, ty::ConstKind::Placeholder(placeholder))
-    }
-
-    #[inline]
-    pub fn new_alias(
-        tcx: TyCtxt<'tcx>,
-        is_rigid: ty::IsRigid,
-        alias_const: ty::AliasConst<'tcx>,
-    ) -> Const<'tcx> {
-        Const::new(tcx, ty::ConstKind::Alias(is_rigid, alias_const))
-    }
-
-    #[inline]
-    pub fn new_value(tcx: TyCtxt<'tcx>, valtree: ty::ValTree<'tcx>, ty: Ty<'tcx>) -> Const<'tcx> {
-        Const::new(tcx, ty::ConstKind::Value(ty::Value { ty, valtree }))
-    }
-
-    #[inline]
-    pub fn new_expr(tcx: TyCtxt<'tcx>, expr: ty::Expr<'tcx>) -> Const<'tcx> {
-        Const::new(tcx, ty::ConstKind::Expr(expr))
-    }
-
-    #[inline]
-    pub fn new_error(tcx: TyCtxt<'tcx>, e: ty::ErrorGuaranteed) -> Const<'tcx> {
-        Const::new(tcx, ty::ConstKind::Error(e))
-    }
-
-    /// Like [Ty::new_error] but for constants.
-    #[track_caller]
-    pub fn new_misc_error(tcx: TyCtxt<'tcx>) -> Const<'tcx> {
-        Const::new_error_with_message(
-            tcx,
-            DUMMY_SP,
-            "ty::ConstKind::Error constructed but no error reported",
-        )
-    }
-
-    /// Like [Ty::new_error_with_message] but for constants.
-    #[track_caller]
-    pub fn new_error_with_message(
-        tcx: TyCtxt<'tcx>,
-        span: Span,
-        msg: impl Into<Cow<'static, str>>,
-    ) -> Const<'tcx> {
-        let reported = tcx.dcx().span_delayed_bug(span, msg);
-        Const::new_error(tcx, reported)
-    }
-
-    pub fn is_trivially_wf(self) -> bool {
-        match self.kind() {
-            ty::ConstKind::Param(_) | ty::ConstKind::Placeholder(_) | ty::ConstKind::Bound(..) => {
-                true
-            }
-            ty::ConstKind::Infer(_)
-            | ty::ConstKind::Alias(..)
-            | ty::ConstKind::Value(_)
-            | ty::ConstKind::Error(_)
-            | ty::ConstKind::Expr(_) => false,
-        }
-    }
-}
-
-impl<'tcx> rustc_type_ir::inherent::Const<TyCtxt<'tcx>> for Const<'tcx> {
-    fn new_infer(tcx: TyCtxt<'tcx>, infer: ty::InferConst) -> Self {
-        Const::new_infer(tcx, infer)
-    }
-
-    fn new_var(tcx: TyCtxt<'tcx>, vid: ty::ConstVid) -> Self {
-        Const::new_var(tcx, vid)
-    }
-
-    fn new_bound(
-        interner: TyCtxt<'tcx>,
-        debruijn: ty::DebruijnIndex,
-        bound_const: ty::BoundConst<'tcx>,
-    ) -> Self {
-        Const::new_bound(interner, debruijn, bound_const)
-    }
-
-    fn new_anon_bound(tcx: TyCtxt<'tcx>, debruijn: ty::DebruijnIndex, var: ty::BoundVar) -> Self {
-        Const::new_bound(tcx, debruijn, ty::BoundConst::new(var))
-    }
-
-    fn new_canonical_bound(tcx: TyCtxt<'tcx>, var: rustc_type_ir::BoundVar) -> Self {
-        Const::new_canonical_bound(tcx, var)
-    }
-
-    fn new_placeholder(tcx: TyCtxt<'tcx>, placeholder: ty::PlaceholderConst<'tcx>) -> Self {
-        Const::new_placeholder(tcx, placeholder)
-    }
-
-    fn new_alias(
-        interner: TyCtxt<'tcx>,
-        is_rigid: ty::IsRigid,
-        alias_const: ty::AliasConst<'tcx>,
-    ) -> Self {
-        Const::new_alias(interner, is_rigid, alias_const)
-    }
-
-    fn new_expr(interner: TyCtxt<'tcx>, expr: ty::Expr<'tcx>) -> Self {
-        Const::new_expr(interner, expr)
-    }
-
-    fn new_error(interner: TyCtxt<'tcx>, guar: ErrorGuaranteed) -> Self {
-        Const::new_error(interner, guar)
-    }
-}
-
+#[extension(pub trait ConstExt<'tcx>)]
 impl<'tcx> Const<'tcx> {
     /// Creates a constant with the given integer value and interns it.
     #[inline]
-    pub fn from_bits(
+    fn from_bits(
         tcx: TyCtxt<'tcx>,
         bits: u128,
         typing_env: ty::TypingEnv<'tcx>,
@@ -224,33 +38,36 @@ impl<'tcx> Const<'tcx> {
             .layout_of(typing_env.as_query_input(ty))
             .unwrap_or_else(|e| panic!("could not compute layout for {ty:?}: {e:?}"))
             .size;
-        ty::Const::new_value(
-            tcx,
-            ty::ValTree::from_scalar_int(tcx, ScalarInt::try_from_uint(bits, size).unwrap()),
-            ty,
-        )
+        let valtree =
+            ty::ValTree::from_scalar_int(tcx, ScalarInt::try_from_uint(bits, size).unwrap());
+        ty::Const::new_value(tcx, valtree, ty)
     }
 
     #[inline]
     /// Creates an interned zst constant.
-    pub fn zero_sized(tcx: TyCtxt<'tcx>, ty: Ty<'tcx>) -> Self {
+    fn zero_sized(tcx: TyCtxt<'tcx>, ty: Ty<'tcx>) -> Self {
         ty::Const::new_value(tcx, ty::ValTree::zst(tcx), ty)
     }
 
+    #[inline]
+    fn new_value(tcx: TyCtxt<'tcx>, valtree: ty::ValTree<'tcx>, ty: Ty<'tcx>) -> Const<'tcx> {
+        Const::new(tcx, ty::ConstKind::Value(ty::Value { ty, valtree }))
+    }
+
     #[inline]
     /// Creates an interned bool constant.
-    pub fn from_bool(tcx: TyCtxt<'tcx>, v: bool) -> Self {
+    fn from_bool(tcx: TyCtxt<'tcx>, v: bool) -> Self {
         Self::from_bits(tcx, v as u128, ty::TypingEnv::fully_monomorphized(), tcx.types.bool)
     }
 
     #[inline]
     /// Creates an interned usize constant.
-    pub fn from_target_usize(tcx: TyCtxt<'tcx>, n: u64) -> Self {
+    fn from_target_usize(tcx: TyCtxt<'tcx>, n: u64) -> Self {
         Self::from_bits(tcx, n as u128, ty::TypingEnv::fully_monomorphized(), tcx.types.usize)
     }
 
     /// Panics if `self.kind != ty::ConstKind::Value`.
-    pub fn to_value(self) -> ty::Value<'tcx> {
+    fn to_value(self) -> ty::Value<'tcx> {
         match self.kind() {
             ty::ConstKind::Value(cv) => cv,
             _ => bug!("expected ConstKind::Value, got {:?}", self.kind()),
@@ -260,7 +77,7 @@ impl<'tcx> Const<'tcx> {
     /// Attempts to convert to a value.
     ///
     /// Note that this does not normalize the constant.
-    pub fn try_to_value(self) -> Option<ty::Value<'tcx>> {
+    fn try_to_value(self) -> Option<ty::Value<'tcx>> {
         match self.kind() {
             ty::ConstKind::Value(cv) => Some(cv),
             _ => None,
@@ -272,7 +89,7 @@ impl<'tcx> Const<'tcx> {
     ///
     /// Note that this does not normalize the constant.
     #[inline]
-    pub fn to_leaf(self) -> ScalarInt {
+    fn to_leaf(self) -> ScalarInt {
         self.to_value().to_leaf()
     }
 
@@ -281,28 +98,28 @@ impl<'tcx> Const<'tcx> {
     ///
     /// Note that this does not normalize the constant.
     #[inline]
-    pub fn to_branch(self) -> &'tcx [ty::Const<'tcx>] {
+    fn to_branch(self) -> &'tcx [ty::Const<'tcx>] {
         self.to_value().to_branch()
     }
 
     /// Attempts to convert to a `ValTreeKind::Leaf` value.
     ///
     /// Note that this does not normalize the constant.
-    pub fn try_to_leaf(self) -> Option<ScalarInt> {
+    fn try_to_leaf(self) -> Option<ScalarInt> {
         self.try_to_value()?.try_to_leaf()
     }
 
     /// Attempts to convert to a `ValTreeKind::Leaf` value.
     ///
     /// Note that this does not normalize the constant.
-    pub fn try_to_scalar(self) -> Option<Scalar> {
+    fn try_to_scalar(self) -> Option<Scalar> {
         self.try_to_leaf().map(Scalar::Int)
     }
 
     /// Attempts to convert to a `ValTreeKind::Branch` value.
     ///
     /// Note that this does not normalize the constant.
-    pub fn try_to_branch(self) -> Option<&'tcx [ty::Const<'tcx>]> {
+    fn try_to_branch(self) -> Option<&'tcx [ty::Const<'tcx>]> {
         self.try_to_value()?.try_to_branch()
     }
 
@@ -311,21 +128,10 @@ impl<'tcx> Const<'tcx> {
     ///
     /// Note that this does not evaluate the constant.
     #[inline]
-    pub fn try_to_target_usize(self, tcx: TyCtxt<'tcx>) -> Option<u64> {
+    fn try_to_target_usize(self, tcx: TyCtxt<'tcx>) -> Option<u64> {
         self.try_to_value()?.try_to_target_usize(tcx)
     }
 
-    pub fn is_ct_infer(self) -> bool {
-        matches!(self.kind(), ty::ConstKind::Infer(_))
-    }
-
-    pub fn ct_vid(self) -> Option<ty::ConstVid> {
-        match self.kind() {
-            ConstKind::Infer(ty::InferConst::Var(vid)) => Some(vid),
-            _ => None,
-        }
-    }
-
     /// Iterator that walks `self` and any types reachable from
     /// `self`, in depth-first order. Note that just walks the types
     /// that appear in `self`, it does not descend into the fields of
@@ -336,7 +142,7 @@ impl<'tcx> Const<'tcx> {
     /// Foo<Bar<isize>> => { Foo<Bar<isize>>, Bar<isize>, isize }
     /// [isize] => { [isize], isize }
     /// ```
-    pub fn walk(self) -> TypeWalker<TyCtxt<'tcx>> {
+    fn walk(self) -> TypeWalker<TyCtxt<'tcx>> {
         TypeWalker::new(self.into())
     }
 }