Bump walrus from 0.21.0 to 0.21.1

walrus 0.21.1 introduced breaking changes to add support for memory64.
New types are embraced while not adding memory64 support.

Signed-off-by: Scott Andrews <scott@andrews.me>

Cargo.toml

@@ -30,7 +30,7 @@ anyhow = "1"
 clap = { version = "4", features = ["derive"] }
 serde = { version = "1", features = ["derive"] }
 toml = "0.8"
-walrus = "0.21.0"
+walrus = "0.21.1"
 wasm-compose = "0.212.0"
 wasm-metadata = "0.212.0"
 wasm-opt = { version = "0.116.1", optional = true }

src/data.rs

@@ -1,8 +1,8 @@
 use anyhow::{bail, Result};
 use std::collections::HashMap;
 use walrus::{
-    ActiveData, ActiveDataLocation, ConstExpr, DataKind, ElementItems, ElementKind,
-    FunctionBuilder, FunctionId, FunctionKind, Module, RefType, ValType,
+    ir::Value, ConstExpr, DataKind, ElementItems, ElementKind, FunctionBuilder, FunctionId,
+    FunctionKind, Module, RefType, ValType,
 };
 
 use crate::walrus_ops::bump_stack_global;
@@ -121,10 +121,10 @@ impl Data {
         }
         bump_stack_global(module, (self.stack_start - self.stack_ptr) as i32)?;
         module.data.add(
-            DataKind::Active(ActiveData {
+            DataKind::Active {
                 memory,
-                location: ActiveDataLocation::Absolute(self.stack_ptr as u32),
-            }),
+                offset: ConstExpr::Value(Value::I32(self.stack_ptr as i32)),
+            },
             self.bytes.as_slice()[self.stack_ptr..self.stack_start].to_vec(),
         );
 

src/virt_env.rs

@@ -1,8 +1,6 @@
 use anyhow::{bail, Context, Result};
 use serde::Deserialize;
-use walrus::{
-    ir::Value, ActiveData, ActiveDataLocation, ConstExpr, DataKind, ExportItem, GlobalKind, Module,
-};
+use walrus::{ir::Value, ConstExpr, DataKind, ExportItem, GlobalKind, Module};
 
 use crate::walrus_ops::{bump_stack_global, get_active_data_segment};
 
@@ -146,10 +144,10 @@ pub(crate) fn create_env_virt<'a>(module: &'a mut Module, env: &VirtEnv) -> Resu
 
         // Add a new data segment for this new range created at the top of the stack
         module.data.add(
-            DataKind::Active(ActiveData {
+            DataKind::Active {
                 memory,
-                location: ActiveDataLocation::Absolute(field_data_addr),
-            }),
+                offset: ConstExpr::Value(Value::I32(field_data_addr as i32)),
+            },
             field_data_bytes,
         );
         Some(field_data_addr)

src/walrus_ops.rs

@@ -1,20 +1,17 @@
 use anyhow::{bail, Context, Result};
-use walrus::{
-    ir::Value, ActiveData, ActiveDataLocation, ConstExpr, Data, DataKind, GlobalKind, MemoryId,
-    Module,
-};
+use walrus::{ir::Value, ConstExpr, Data, DataKind, GlobalKind, MemoryId, Module};
 
 pub(crate) fn get_active_data_start(data: &Data, mem: MemoryId) -> Result<u32> {
-    let DataKind::Active(active_data) = &data.kind else {
+    let DataKind::Active { memory, offset } = &data.kind else {
         bail!("Adapter data section is not active");
     };
-    if active_data.memory != mem {
+    if *memory != mem {
         bail!("Adapter data memory is not the expected memory id");
     }
-    let ActiveDataLocation::Absolute(loc) = &active_data.location else {
+    let ConstExpr::Value(Value::I32(loc)) = offset else {
         bail!("Adapter data memory is not absolutely offset");
     };
-    Ok(*loc)
+    Ok(*loc as u32)
 }
 
 pub(crate) fn get_active_data_segment(
@@ -36,15 +33,16 @@ pub(crate) fn get_active_data_segment(
         }
     }
     let data = found_data.context("Unable to find data section for ptr")?;
-    let DataKind::Active(ActiveData {
-        location: ActiveDataLocation::Absolute(loc),
+    let DataKind::Active {
+        offset: ConstExpr::Value(Value::I32(loc)),
         ..
-    }) = &data.kind
+    } = &data.kind
     else {
         unreachable!()
     };
+    let loc = *loc as u32;
     let data_id = data.id();
-    let offset = (addr - *loc) as usize;
+    let offset = (addr - loc) as usize;
     Ok((module.data.get_mut(data_id), offset))
 }