Add support for vector in DataValueExt::int() (bytecodealliance#6844)

* Add support for vector in DataValueExt::int() Fixes bytecodealliance#6827 * Replace `if` with `match` * Enable interpreter test for simd ineg Issue bytecodealliance#6827 * Format code with `cargo fmt` and also improve comment
eduardomourar · Aug 18, 2023 · e3af3d8 · e3af3d8
1 parent 9e5cb14
commit e3af3d8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/cranelift/filetests/filetests/runtests/simd-ineg.clif b/cranelift/filetests/filetests/runtests/simd-ineg.clif
@@ -1,3 +1,4 @@
+test interpret
 test run
 target aarch64
 target s390x

diff --git a/cranelift/interpreter/src/value.rs b/cranelift/interpreter/src/value.rs
@@ -263,7 +263,14 @@ macro_rules! bitop {
 
 impl DataValueExt for DataValue {
     fn int(n: i128, ty: Type) -> ValueResult<Self> {
-        if ty.is_int() && !ty.is_vector() {
+        if ty.is_vector() {
+            // match ensures graceful failure since read_from_slice_ne()
+            // panics on anything other than 8 and 16 bytes
+            match ty.bytes() {
+                8 | 16 => Ok(DataValue::read_from_slice_ne(&n.to_ne_bytes(), ty)),
+                _ => Err(ValueError::InvalidType(ValueTypeClass::Vector, ty)),
+            }
+        } else if ty.is_int() {
             DataValue::from_integer(n, ty).map_err(|_| ValueError::InvalidValue(ty))
         } else {
             Err(ValueError::InvalidType(ValueTypeClass::Integer, ty))