Skip to content

Commit 3d4f78b

Browse files
committed
simplify memory_bytes utility method
1 parent 4757a39 commit 3d4f78b

File tree

1 file changed

+4
-9
lines changed
  • crates/wasmi/src/engine/executor/handler

1 file changed

+4
-9
lines changed

crates/wasmi/src/engine/executor/handler/utils.rs

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -197,16 +197,11 @@ pub fn memory_bytes<'a>(
197197
instance: Inst,
198198
state: &'a mut VmState,
199199
) -> &'a mut [u8] {
200-
match memory.is_default() {
201-
true => mem0_bytes::<'a>(mem0, mem0_len),
202-
false => {
203-
let instance = unsafe { instance.as_ref() };
204-
let Some(memory) = instance.get_memory(u32::from(u16::from(memory))) else {
205-
return &mut [];
206-
};
207-
resolve_memory_mut(state.store, &memory).data_mut()
208-
}
200+
if memory.is_default() {
201+
return mem0_bytes::<'a>(mem0, mem0_len);
209202
}
203+
let memory = fetch_memory(instance, memory);
204+
resolve_memory_mut(state.store, &memory).data_mut()
210205
}
211206

212207
pub fn memory_slice(memory: &CoreMemory, pos: usize, len: usize) -> Result<&[u8], TrapCode> {

0 commit comments

Comments
 (0)