diff options
| author | Oli Scherer <git-spam-no-reply9815368754983@oli-obk.de> | 2023-02-14 08:51:19 +0000 |
|---|---|---|
| committer | Oli Scherer <git-spam-no-reply9815368754983@oli-obk.de> | 2023-02-14 08:51:19 +0000 |
| commit | 14bc2e60c236d3b349142cda071cafc9ceee2d3a (patch) | |
| tree | e8f3304aab4d7baa46af3232fad3cc26c8ee2df5 | |
| parent | c95eca2857ef712c8fe952c17fce8a5e962fcacc (diff) | |
| download | rust-14bc2e60c236d3b349142cda071cafc9ceee2d3a.tar.gz rust-14bc2e60c236d3b349142cda071cafc9ceee2d3a.zip | |
s/eval_usize/eval_target_usize/ for clarity
| -rw-r--r-- | src/base.rs | 2 | ||||
| -rw-r--r-- | src/intrinsics/simd.rs | 4 | ||||
| -rw-r--r-- | src/unsize.rs | 2 | ||||
| -rw-r--r-- | src/value_and_place.rs | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/base.rs b/src/base.rs index 189d952a92f..95778de3aba 100644 --- a/src/base.rs +++ b/src/base.rs @@ -857,7 +857,7 @@ fn codegen_stmt<'tcx>( fn codegen_array_len<'tcx>(fx: &mut FunctionCx<'_, '_, 'tcx>, place: CPlace<'tcx>) -> Value { match *place.layout().ty.kind() { ty::Array(_elem_ty, len) => { - let len = fx.monomorphize(len).eval_usize(fx.tcx, ParamEnv::reveal_all()) as i64; + let len = fx.monomorphize(len).eval_target_usize(fx.tcx, ParamEnv::reveal_all()) as i64; fx.bcx.ins().iconst(fx.pointer_type, len) } ty::Slice(_elem_ty) => { diff --git a/src/intrinsics/simd.rs b/src/intrinsics/simd.rs index b33eb29754a..a1d63acfb61 100644 --- a/src/intrinsics/simd.rs +++ b/src/intrinsics/simd.rs @@ -141,7 +141,7 @@ pub(super) fn codegen_simd_intrinsic_call<'tcx>( let idx_ty = fx.monomorphize(idx.ty(fx.mir, fx.tcx)); match idx_ty.kind() { ty::Array(ty, len) if matches!(ty.kind(), ty::Uint(ty::UintTy::U32)) => len - .try_eval_usize(fx.tcx, ty::ParamEnv::reveal_all()) + .try_eval_target_usize(fx.tcx, ty::ParamEnv::reveal_all()) .unwrap_or_else(|| { span_bug!(span, "could not evaluate shuffle index array length") }) @@ -735,7 +735,7 @@ pub(super) fn codegen_simd_intrinsic_call<'tcx>( ty::Uint(i) if i.bit_width() == Some(expected_int_bits) => {} ty::Array(elem, len) if matches!(elem.kind(), ty::Uint(ty::UintTy::U8)) - && len.try_eval_usize(fx.tcx, ty::ParamEnv::reveal_all()) + && len.try_eval_target_usize(fx.tcx, ty::ParamEnv::reveal_all()) == Some(expected_bytes) => {} _ => { fx.tcx.sess.span_fatal( diff --git a/src/unsize.rs b/src/unsize.rs index 9c88f7dbcda..a0745582d66 100644 --- a/src/unsize.rs +++ b/src/unsize.rs @@ -24,7 +24,7 @@ pub(crate) fn unsized_info<'tcx>( (&ty::Array(_, len), &ty::Slice(_)) => fx .bcx .ins() - .iconst(fx.pointer_type, len.eval_usize(fx.tcx, ParamEnv::reveal_all()) as i64), + .iconst(fx.pointer_type, len.eval_target_usize(fx.tcx, ParamEnv::reveal_all()) as i64), ( &ty::Dynamic(ref data_a, _, src_dyn_kind), &ty::Dynamic(ref data_b, _, target_dyn_kind), diff --git a/src/value_and_place.rs b/src/value_and_place.rs index 320eecaee00..cc1edaa97d8 100644 --- a/src/value_and_place.rs +++ b/src/value_and_place.rs @@ -564,8 +564,8 @@ impl<'tcx> CPlace<'tcx> { CPlaceInner::Var(_local, var) => { if let ty::Array(element, len) = dst_layout.ty.kind() { // Can only happen for vector types - let len = - u32::try_from(len.eval_usize(fx.tcx, ParamEnv::reveal_all())).unwrap(); + let len = u32::try_from(len.eval_target_usize(fx.tcx, ParamEnv::reveal_all())) + .unwrap(); let vector_ty = fx.clif_type(*element).unwrap().by(len).unwrap(); let data = match from.0 { |