Skip to content

fix: always return an array of u8s when simplifying Intrinsic::ToRadix calls #6663

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TomAFrench merged 3 commits into from
Dec 2, 2024
Merged

fix: always return an array of u8s when simplifying Intrinsic::ToRadix calls #6663

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b1cfb01
fix: use correct type when simplifying `Intrinsic::ToRadix` calls
TomAFrench Nov 29, 2024
324b8ee
.
TomAFrench Nov 29, 2024
68692f6
.
TomAFrench Nov 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions compiler/noirc_evaluator/src/ssa/ir/instruction/call.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,9 @@ pub(super) fn simplify_call(
} else {
unreachable!("ICE: Intrinsic::ToRadix return type must be array")
};
constant_to_radix(endian, field, 2, limb_count, dfg, block, call_stack)
constant_to_radix(endian, field, 2, limb_count, |values| {
make_constant_array(dfg, values.into_iter(), Type::bool(), block, call_stack)
})
} else {
SimplifyResult::None
}
Expand All @@ -75,7 +77,15 @@ pub(super) fn simplify_call(
} else {
unreachable!("ICE: Intrinsic::ToRadix return type must be array")
};
constant_to_radix(endian, field, radix, limb_count, dfg, block, call_stack)
constant_to_radix(endian, field, radix, limb_count, |values| {
make_constant_array(
dfg,
values.into_iter(),
Type::unsigned(8),
block,
call_stack,
)
})
} else {
SimplifyResult::None
}
Expand Down Expand Up @@ -661,9 +671,7 @@ fn constant_to_radix(
field: FieldElement,
radix: u32,
limb_count: u32,
dfg: &mut DataFlowGraph,
block: BasicBlockId,
call_stack: &CallStack,
mut make_array: impl FnMut(Vec<FieldElement>) -> ValueId,
) -> SimplifyResult {
let bit_size = u32::BITS - (radix - 1).leading_zeros();
let radix_big = BigUint::from(radix);
Expand All @@ -684,13 +692,7 @@ fn constant_to_radix(
if endian == Endian::Big {
limbs.reverse();
}
let result_array = make_constant_array(
dfg,
limbs.into_iter(),
Type::unsigned(bit_size),
block,
call_stack,
);
let result_array = make_array(limbs);
SimplifyResult::SimplifiedTo(result_array)
}
}
Expand Down