T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cranelift: Add coerce_bools_to_ints helper

Browse Source
This commit is contained in:
Afonso Bordado
2021-09-10 15:38:30 +01:00
parent d31bdff7db
commit 85d468dc5a
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cranelift/codegen/src/ir/types.rs
View File

@@ -340,6 +340,19 @@ impl Type {
Err(()) => panic!("unable to determine architecture pointer width"),
}
}
/// Coerces boolean types (scalar and vectors) into their integer counterparts.
/// B1 is converted into I8.
pub fn coerce_bools_to_ints(self) -> Self {
let is_scalar_bool = self.is_bool();
let is_vector_bool = self.is_vector() && self.lane_type().is_bool();
if is_scalar_bool || is_vector_bool {
self.as_int()
} else {
self
}
}
}
impl Display for Type {

15
cranelift/filetests/src/function_runner.rs
View File

@@ -297,15 +297,7 @@ fn make_trampoline(signature: &ir::Signature, isa: &dyn TargetIsa) -> Function {
.enumerate()
.map(|(i, param)| {
// Calculate the type to load from memory, using integers for booleans (no encodings).
let is_scalar_bool = param.value_type.is_bool();
let is_vector_bool =
param.value_type.is_vector() && param.value_type.lane_type().is_bool();
let ty = if is_scalar_bool || is_vector_bool {
param.value_type.as_int()
} else {
param.value_type
};
let ty = param.value_type.coerce_bools_to_ints();
// Load the value.
let loaded = builder.ins().load(
@@ -314,6 +306,11 @@ fn make_trampoline(signature: &ir::Signature, isa: &dyn TargetIsa) -> Function {
values_vec_ptr_val,
(i * UnboxedValues::SLOT_SIZE) as i32,
);
let is_scalar_bool = param.value_type.is_bool();
let is_vector_bool =
param.value_type.is_vector() && param.value_type.lane_type().is_bool();
// For booleans, we want to type-convert the loaded integer into a boolean and ensure
// that we are using the architecture's canonical boolean representation (presumably
// comparison will emit this).