initial

Author: logan-gatlin

src/ir/mod.rs

@@ -1435,7 +1435,7 @@ pub struct MemArg {
     /// The alignment of the memory operation, must be a power of two
     pub align: u32,
     /// The offset of the memory operation, in bytes from the source address
-    pub offset: u32,
+    pub offset: u64,
 }
 
 /// The different kinds of atomic rmw operations

src/module/data.rs

@@ -225,6 +225,9 @@ impl Module {
                             ConstExpr::Value(Value::I64(_)) => {}
                             ConstExpr::Global(global)
                                 if self.globals.get(global).ty == ValType::I64 => {}
+                            // Extended const expressions are already validated
+                            // by wasmparser to produce the correct type.
+                            ConstExpr::Extended(_) => {}
                             _ => bail!(
                                 "data {} is active for 64-bit memory but has non-i64 offset",
                                 i
@@ -235,6 +238,9 @@ impl Module {
                             ConstExpr::Value(Value::I32(_)) => {}
                             ConstExpr::Global(global)
                                 if self.globals.get(global).ty == ValType::I32 => {}
+                            // Extended const expressions are already validated
+                            // by wasmparser to produce the correct type.
+                            ConstExpr::Extended(_) => {}
                             _ => bail!(
                                 "data {} is active for 32-bit memory but has non-i32 offset",
                                 i

src/module/elements.rs

@@ -171,6 +171,9 @@ impl Module {
                             ConstExpr::Value(Value::I64(_)) => {}
                             ConstExpr::Global(global)
                                 if self.globals.get(global).ty == ValType::I64 => {}
+                            // Extended const expressions are already validated
+                            // by wasmparser to produce the correct type.
+                            ConstExpr::Extended(_) => {}
                             _ => bail!(
                                 "element {} is active for 64-bit table but has non-i64 offset",
                                 i
@@ -181,6 +184,9 @@ impl Module {
                             ConstExpr::Value(Value::I32(_)) => {}
                             ConstExpr::Global(global)
                                 if self.globals.get(global).ty == ValType::I32 => {}
+                            // Extended const expressions are already validated
+                            // by wasmparser to produce the correct type.
+                            ConstExpr::Extended(_) => {}
                             _ => bail!(
                                 "element {} is active for 32-bit table but has non-i32 offset",
                                 i

src/module/functions/local_function/emit.rs

@@ -1134,7 +1134,7 @@ impl Emit<'_, '_> {
             align >>= 1;
         }
         wasm_encoder::MemArg {
-            offset: offset as u64,
+            offset,
             align: align_exponent,
             memory_index,
         }

src/module/functions/local_function/mod.rs

@@ -328,7 +328,7 @@ fn append_instruction(ctx: &mut ValidationContext, inst: Operator, loc: InstrLoc
             ctx.indices.get_memory(arg.memory).unwrap(),
             MemArg {
                 align: 1 << (arg.align as i32),
-                offset: arg.offset as u32,
+                offset: arg.offset,
             },
         )
     };