bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

cleanup op_to_const a bit; rename ConstValue::ByRef → Indirect

Browse source
This commit is contained in:
Ralf Jung 2023-09-12 07:49:25 +02:00
parent 551f481ffb
commit 0f8908da27
14 changed files with 40 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_mir_transform/src/const_prop.rs
View file

@ -143,7 +143,7 @@ impl<'mir, 'tcx> interpret::Machine<'mir, 'tcx> for ConstPropMachine<'mir, 'tcx>
#[inline(always)]
fn enforce_alignment(_ecx: &InterpCx<'mir, 'tcx, Self>) -> CheckAlignment {
// We do not check for alignment to avoid having to carry an `Align`
// in `ConstValue::ByRef`.
// in `ConstValue::Indirect`.
CheckAlignment::No
}
@ -552,7 +552,7 @@ impl<'mir, 'tcx> ConstPropagator<'mir, 'tcx> {
.ok()?;
Some(ConstantKind::Val(
ConstValue::ByRef { alloc_id, offset: Size::ZERO },
ConstValue::Indirect { alloc_id, offset: Size::ZERO },
value.layout.ty,
))
}

2
compiler/rustc_mir_transform/src/large_enums.rs
View file

@ -153,7 +153,7 @@ impl EnumSizeOpt {
span,
user_ty: None,
literal: ConstantKind::Val(
interpret::ConstValue::ByRef { alloc_id, offset: Size::ZERO },
interpret::ConstValue::Indirect { alloc_id, offset: Size::ZERO },
tmp_ty,
),
};