interpret: remove Readable trait, we can use Projectable instead

Author: RalfJung

compiler/rustc_const_eval/src/interpret/discriminant.rs

@@ -7,7 +7,7 @@ use rustc_target::abi::{self, TagEncoding, VariantIdx, Variants};
 use tracing::{instrument, trace};
 
 usesuper::{
- err_ub, throw_ub,ImmTy,InterpCx,InterpResult,Machine,Readable,Scalar,Writeable,
+ err_ub, throw_ub,ImmTy,InterpCx,InterpResult,Machine,Projectable,Scalar,Writeable,
 };
 
 impl<'tcx,M:Machine<'tcx>>InterpCx<'tcx,M>{
@@ -60,7 +60,7 @@ impl<'tcx, M: Machine<'tcx>> InterpCx<'tcx, M> {
 #[instrument(skip(self), level = "trace")]
 pubfnread_discriminant(
 &self,
-op:&implReadable<'tcx,M::Provenance>,
+op:&implProjectable<'tcx,M::Provenance>,
 ) -> InterpResult<'tcx,VariantIdx>{
 let ty = op.layout().ty;
 trace!("read_discriminant_value {:#?}", op.layout());

compiler/rustc_const_eval/src/interpret/mod.rs

@@ -33,7 +33,7 @@ pub(crate) use self::intrinsics::eval_nullary_intrinsic;
 pubuseself::machine::{compile_time_machine,AllocMap,Machine,MayLeak,ReturnAction};
 pubuseself::memory::{AllocKind,AllocRef,AllocRefMut,FnVal,Memory,MemoryKind};
 useself::operand::Operand;
-pubuseself::operand::{ImmTy,Immediate,OpTy,Readable};
+pubuseself::operand::{ImmTy,Immediate,OpTy};
 pubuseself::place::{MPlaceTy,MemPlaceMeta,PlaceTy,Writeable};
 useself::place::{MemPlace,Place};
 pubuseself::projection::{OffsetMode,Projectable};

compiler/rustc_const_eval/src/interpret/operand.rs

@@ -490,32 +490,6 @@ impl<'tcx, Prov: Provenance> Projectable<'tcx, Prov> for OpTy<'tcx, Prov> {
 }
 }
 
-/// The `Readable` trait describes interpreter values that one can read from.
-pubtraitReadable<'tcx,Prov:Provenance>:Projectable<'tcx,Prov>{
-fnas_mplace_or_imm(&self) -> Either<MPlaceTy<'tcx,Prov>,ImmTy<'tcx,Prov>>;
-}
-
-impl<'tcx,Prov:Provenance>Readable<'tcx,Prov>forOpTy<'tcx,Prov>{
-#[inline(always)]
-fnas_mplace_or_imm(&self) -> Either<MPlaceTy<'tcx,Prov>,ImmTy<'tcx,Prov>>{
-self.as_mplace_or_imm()
-}
-}
-
-impl<'tcx,Prov:Provenance>Readable<'tcx,Prov>forMPlaceTy<'tcx,Prov>{
-#[inline(always)]
-fnas_mplace_or_imm(&self) -> Either<MPlaceTy<'tcx,Prov>,ImmTy<'tcx,Prov>>{
-Left(self.clone())
-}
-}
-
-impl<'tcx,Prov:Provenance>Readable<'tcx,Prov>forImmTy<'tcx,Prov>{
-#[inline(always)]
-fnas_mplace_or_imm(&self) -> Either<MPlaceTy<'tcx,Prov>,ImmTy<'tcx,Prov>>{
-Right(self.clone())
-}
-}
-
 impl<'tcx,M:Machine<'tcx>>InterpCx<'tcx,M>{
 /// Try reading an immediate in memory; this is interesting particularly for `ScalarPair`.
 /// Returns `None` if the layout does not permit loading this as a value.
@@ -588,9 +562,9 @@ impl<'tcx, M: Machine<'tcx>> InterpCx<'tcx, M> {
 /// ConstProp needs it, though.
 pubfnread_immediate_raw(
 &self,
-src:&implReadable<'tcx,M::Provenance>,
+src:&implProjectable<'tcx,M::Provenance>,
 ) -> InterpResult<'tcx,Either<MPlaceTy<'tcx,M::Provenance>,ImmTy<'tcx,M::Provenance>>>{
-Ok(match src.as_mplace_or_imm(){
+Ok(match src.to_op(self)?.as_mplace_or_imm(){
 Left(ref mplace) => {
 ifletSome(val) = self.read_immediate_from_mplace_raw(mplace)? {
 Right(val)
@@ -608,7 +582,7 @@ impl<'tcx, M: Machine<'tcx>> InterpCx<'tcx, M> {
 #[inline(always)]
 pubfnread_immediate(
 &self,
-op:&implReadable<'tcx,M::Provenance>,
+op:&implProjectable<'tcx,M::Provenance>,
 ) -> InterpResult<'tcx,ImmTy<'tcx,M::Provenance>>{
 if !matches!(
  op.layout().abi,
@@ -627,7 +601,7 @@ impl<'tcx, M: Machine<'tcx>> InterpCx<'tcx, M> {
 /// Read a scalar from a place
 pubfnread_scalar(
 &self,
-op:&implReadable<'tcx,M::Provenance>,
+op:&implProjectable<'tcx,M::Provenance>,
 ) -> InterpResult<'tcx,Scalar<M::Provenance>>{
 Ok(self.read_immediate(op)?.to_scalar())
 }
@@ -638,21 +612,21 @@ impl<'tcx, M: Machine<'tcx>> InterpCx<'tcx, M> {
 /// Read a pointer from a place.
 pubfnread_pointer(
 &self,
-op:&implReadable<'tcx,M::Provenance>,
+op:&implProjectable<'tcx,M::Provenance>,
 ) -> InterpResult<'tcx,Pointer<Option<M::Provenance>>>{
 self.read_scalar(op)?.to_pointer(self)
 }
 /// Read a pointer-sized unsigned integer from a place.
 pubfnread_target_usize(
 &self,
-op:&implReadable<'tcx,M::Provenance>,
+op:&implProjectable<'tcx,M::Provenance>,
 ) -> InterpResult<'tcx,u64>{
 self.read_scalar(op)?.to_target_usize(self)
 }
 /// Read a pointer-sized signed integer from a place.
 pubfnread_target_isize(
 &self,
-op:&implReadable<'tcx,M::Provenance>,
+op:&implProjectable<'tcx,M::Provenance>,
 ) -> InterpResult<'tcx,i64>{
 self.read_scalar(op)?.to_target_isize(self)
 }

compiler/rustc_const_eval/src/interpret/place.rs

@@ -15,7 +15,7 @@ use tracing::{instrument, trace};
 usesuper::{
  alloc_range, mir_assign_valid_types,AllocRef,AllocRefMut,CheckAlignMsg,CtfeProvenance,
 ImmTy,Immediate,InterpCx,InterpResult,Machine,MemoryKind,Misalignment,OffsetMode,OpTy,
-Operand,Pointer,Projectable,Provenance,Readable,Scalar,
+Operand,Pointer,Projectable,Provenance,Scalar,
 };
 
 #[derive(Copy,Clone,Hash,PartialEq,Eq,Debug)]
@@ -436,7 +436,7 @@ where
 #[instrument(skip(self), level = "trace")]
 pubfnderef_pointer(
 &self,
-src:&implReadable<'tcx,M::Provenance>,
+src:&implProjectable<'tcx,M::Provenance>,
 ) -> InterpResult<'tcx,MPlaceTy<'tcx,M::Provenance>>{
 if src.layout().ty.is_box(){
 // Derefer should have removed all Box derefs.
@@ -768,7 +768,7 @@ where
 #[inline(always)]
 pub(super)fncopy_op_no_dest_validation(
 &mutself,
-src:&implReadable<'tcx,M::Provenance>,
+src:&implProjectable<'tcx,M::Provenance>,
 dest:&implWriteable<'tcx,M::Provenance>,
 ) -> InterpResult<'tcx>{
 self.copy_op_inner(
@@ -781,7 +781,7 @@ where
 #[inline(always)]
 pubfncopy_op_allow_transmute(
 &mutself,
-src:&implReadable<'tcx,M::Provenance>,
+src:&implProjectable<'tcx,M::Provenance>,
 dest:&implWriteable<'tcx,M::Provenance>,
 ) -> InterpResult<'tcx>{
 self.copy_op_inner(
@@ -794,7 +794,7 @@ where
 #[inline(always)]
 pubfncopy_op(
 &mutself,
-src:&implReadable<'tcx,M::Provenance>,
+src:&implProjectable<'tcx,M::Provenance>,
 dest:&implWriteable<'tcx,M::Provenance>,
 ) -> InterpResult<'tcx>{
 self.copy_op_inner(
@@ -808,7 +808,7 @@ where
 #[instrument(skip(self), level = "trace")]
 fncopy_op_inner(
 &mutself,
-src:&implReadable<'tcx,M::Provenance>,
+src:&implProjectable<'tcx,M::Provenance>,
 dest:&implWriteable<'tcx,M::Provenance>,
 allow_transmute:bool,
 validate_dest:bool,
@@ -843,7 +843,7 @@ where
 #[instrument(skip(self), level = "trace")]
 fncopy_op_no_validate(
 &mutself,
-src:&implReadable<'tcx,M::Provenance>,
+src:&implProjectable<'tcx,M::Provenance>,
 dest:&implWriteable<'tcx,M::Provenance>,
 allow_transmute:bool,
 ) -> InterpResult<'tcx>{

src/tools/miri/src/helpers.rs

@@ -869,7 +869,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
 /// Dereference a pointer operand to a place using `layout` instead of the pointer's declared type
 fnderef_pointer_as(
 &self,
-op:&implReadable<'tcx,Provenance>,
+op:&implProjectable<'tcx,Provenance>,
 layout:TyAndLayout<'tcx>,
 ) -> InterpResult<'tcx,MPlaceTy<'tcx>>{
 let this = self.eval_context_ref();
@@ -880,7 +880,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
 /// Calculates the MPlaceTy given the offset and layout of an access on an operand
 fnderef_pointer_and_offset(
 &self,
-op:&implReadable<'tcx,Provenance>,
+op:&implProjectable<'tcx,Provenance>,
 offset:u64,
 base_layout:TyAndLayout<'tcx>,
 value_layout:TyAndLayout<'tcx>,
@@ -897,7 +897,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
 
 fnderef_pointer_and_read(
 &self,
-op:&implReadable<'tcx,Provenance>,
+op:&implProjectable<'tcx,Provenance>,
 offset:u64,
 base_layout:TyAndLayout<'tcx>,
 value_layout:TyAndLayout<'tcx>,
@@ -909,7 +909,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
 
 fnderef_pointer_and_write(
 &mutself,
-op:&implReadable<'tcx,Provenance>,
+op:&implProjectable<'tcx,Provenance>,
 offset:u64,
 value:implInto<Scalar>,
 base_layout:TyAndLayout<'tcx>,