Forward misc. integration changes from #1655 (#1688)

* improve debug_assert failure message

* fix field ordering of TableSet operations

* add #[inline(always)] to decode impl

Benchmarks show significant performance improvements.

* add #[inline(always)] to TryFrom<u16> for OpCode

* improve code formatting in match

* add trivial {Read,Write}As impls for UntypedVal

* add From<Memory> for u32 impl

* apply rustfmt

Author: Robbepop

crates/core/src/typed.rs

@@ -93,7 +93,12 @@ macro_rules! impl_from_typed_value_for {
                     // since the whole translation process assumes that Wasm validation
                     // was already performed and thus type checking does not necessarily
                     // need to happen redundantly outside of debug builds.
-                    debug_assert!(matches!(typed_value.ty, <$ty as Typed>::TY));
+                    debug_assert!(
+                        matches!(typed_value.ty, <$ty as Typed>::TY),
+                        "type mismatch: expected {:?} but found {:?}",
+                        <$ty as Typed>::TY,
+                        typed_value.ty,
+                    );
                     Self::from(typed_value.value)
                 }
             }

crates/core/src/untyped.rs

@@ -35,6 +35,12 @@ pub trait ReadAs<T> {
     fn read_as(&self) -> T;
 }
 
+impl ReadAs<UntypedVal> for UntypedVal {
+    fn read_as(&self) -> UntypedVal {
+        *self
+    }
+}
+
 macro_rules! impl_read_as_for_int {
     ( $( $int:ty ),* $(,)? ) => {
         $(
@@ -83,6 +89,12 @@ pub trait WriteAs<T> {
     fn write_as(&mut self, value: T);
 }
 
+impl WriteAs<UntypedVal> for UntypedVal {
+    fn write_as(&mut self, value: UntypedVal) {
+        *self = value;
+    }
+}
+
 macro_rules! impl_write_as_for_int {
     ( $( $int:ty as $as:ty ),* $(,)? ) => {
         $(

crates/fuzz/src/oracle/wasmi.rs

@@ -166,16 +166,16 @@ impl From<wasmi::Error> for FuzzError {
             return FuzzError::Other;
         };
         let trap_code = match trap_code {
-            TrapCode::UnreachableCodeReached => crate::TrapCode::UnreachableCodeReached,
-            TrapCode::MemoryOutOfBounds => crate::TrapCode::MemoryOutOfBounds,
-            TrapCode::TableOutOfBounds => crate::TrapCode::TableOutOfBounds,
-            TrapCode::IndirectCallToNull => crate::TrapCode::IndirectCallToNull,
-            TrapCode::IntegerDivisionByZero => crate::TrapCode::IntegerDivisionByZero,
-            TrapCode::IntegerOverflow => crate::TrapCode::IntegerOverflow,
-            TrapCode::BadConversionToInteger => crate::TrapCode::BadConversionToInteger,
-            TrapCode::StackOverflow => crate::TrapCode::StackOverflow,
-            TrapCode::BadSignature => crate::TrapCode::BadSignature,
-            TrapCode::OutOfFuel | TrapCode::GrowthOperationLimited => return FuzzError::Other,
+            | TrapCode::UnreachableCodeReached => crate::TrapCode::UnreachableCodeReached,
+            | TrapCode::MemoryOutOfBounds => crate::TrapCode::MemoryOutOfBounds,
+            | TrapCode::TableOutOfBounds => crate::TrapCode::TableOutOfBounds,
+            | TrapCode::IndirectCallToNull => crate::TrapCode::IndirectCallToNull,
+            | TrapCode::IntegerDivisionByZero => crate::TrapCode::IntegerDivisionByZero,
+            | TrapCode::IntegerOverflow => crate::TrapCode::IntegerOverflow,
+            | TrapCode::BadConversionToInteger => crate::TrapCode::BadConversionToInteger,
+            | TrapCode::StackOverflow => crate::TrapCode::StackOverflow,
+            | TrapCode::BadSignature => crate::TrapCode::BadSignature,
+            | TrapCode::OutOfFuel | TrapCode::GrowthOperationLimited => return FuzzError::Other,
         };
         FuzzError::Trap(trap_code)
     }

crates/ir2/build/display/op_code.rs

@@ -75,6 +75,7 @@ impl Display for DisplayOpCode<&'_ Isa> {
             \n\
             {indent}impl TryFrom<u16> for OpCode {{\n\
             {indent}    type Error = InvalidOpCode;\n\
+            {indent}    #[inline(always)]
             {indent}    fn try_from(value: u16) -> Result<Self, Self::Error> {{\n\
             {indent}        let op_code = match value {{\n\
                                 {match_arms_tryfrom},\n\

crates/ir2/build/op.rs

@@ -2150,7 +2150,7 @@ impl TableSetOp {
     }
 
     pub fn fields(&self) -> [Field; 3] {
-        [self.index_field(), self.value_field(), self.table_field()]
+        [self.table_field(), self.index_field(), self.value_field()]
     }
 }
 

crates/ir2/src/decode/mod.rs

@@ -169,6 +169,7 @@ macro_rules! impl_decode_fallible_using {
     ( $($ty:ty as $as:ty = $e:expr),* $(,)? ) => {
         $(
             impl Decode for $ty {
+                #[inline(always)]
                 fn decode<D: Decoder>(decoder: &mut D) -> Result<Self, DecodeError> {
                     $e(<$as as Decode>::decode(decoder)?)
                 }

crates/ir2/src/index.rs

@@ -62,6 +62,12 @@ macro_rules! define_index {
 }
 for_each_index!(define_index);
 
+impl From<Memory> for u32 {
+    fn from(value: Memory) -> Self {
+        u32::from(value.0)
+    }
+}
+
 impl TryFrom<u32> for Memory {
     type Error = Error;