mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki 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 d1ea6997e8
commit a5b81faef0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/constant.rs
View File

@ -116,7 +116,7 @@ pub(crate) fn codegen_const_value<'tcx>(
} }
match const_val { match const_val {
ConstValue::ZeroSized => unreachable!(), // we already handles ZST above ConstValue::ZeroSized => unreachable!(), // we already handled ZST above
ConstValue::Scalar(x) => match x { ConstValue::Scalar(x) => match x {
Scalar::Int(int) => { Scalar::Int(int) => {
if fx.clif_type(layout.ty).is_some() { if fx.clif_type(layout.ty).is_some() {
@ -200,7 +200,7 @@ pub(crate) fn codegen_const_value<'tcx>(
CValue::by_val(val, layout) CValue::by_val(val, layout)
} }
}, },
ConstValue::ByRef { alloc_id, offset } => { ConstValue::Indirect { alloc_id, offset } => {
let alloc = fx.tcx.global_alloc(alloc_id).unwrap_memory(); let alloc = fx.tcx.global_alloc(alloc_id).unwrap_memory();
// FIXME: avoid creating multiple allocations for the same AllocId? // FIXME: avoid creating multiple allocations for the same AllocId?
CValue::by_ref( CValue::by_ref(

2
src/intrinsics/simd.rs
View File

@ -172,7 +172,7 @@ pub(super) fn codegen_simd_intrinsic_call<'tcx>(
.expect("simd_shuffle idx not const"); .expect("simd_shuffle idx not const");
let idx_bytes = match idx_const { let idx_bytes = match idx_const {
ConstValue::ByRef { alloc_id, offset } => { ConstValue::Indirect { alloc_id, offset } => {
let alloc = fx.tcx.global_alloc(alloc_id).unwrap_memory(); let alloc = fx.tcx.global_alloc(alloc_id).unwrap_memory();
let size = Size::from_bytes( let size = Size::from_bytes(
4 * ret_lane_count, /* size_of([u32; ret_lane_count]) */ 4 * ret_lane_count, /* size_of([u32; ret_lane_count]) */