christoph/wamr
1
Fork 0
Code Releases Activity

Fix data/elem drop (#2747)

Browse Source 
Currently, `data.drop` instruction is implemented by directly modifying the
underlying module. It breaks use cases where you have multiple instances
sharing a single loaded module. `elem.drop` has the same problem too.

This PR  fixes the issue by keeping track of which data/elem segments have
been dropped by using bitmaps for each module instances separately, and
add a sample to demonstrate the issue and make the CI run it.

Also add a missing check of dropped elements to the fast-jit `table.init`.

Fixes: https://github.com/bytecodealliance/wasm-micro-runtime/issues/2735
Fixes: https://github.com/bytecodealliance/wasm-micro-runtime/issues/2772
This commit is contained in:
YAMAMOTO Takashi
2023-11-18 09:50:16 +09:00
committed by GitHub
parent 08c0ec74c4
commit 562a5dd1b6
26 changed files with 745 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
core/shared/utils/bh_bitmap.c Normal file
View File

@ -0,0 +1,27 @@
/*
* Copyright (C) 2021 Intel Corporation. All rights reserved.
* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
*/
#include "bh_bitmap.h"
bh_bitmap *
bh_bitmap_new(uintptr_t begin_index, unsigned bitnum)
{
bh_bitmap *bitmap;
uint32 bitmap_size = (bitnum + 7) / 8;
uint32 total_size = offsetof(bh_bitmap, map) + bitmap_size;
if (bitnum > UINT32_MAX - 7 || total_size < offsetof(bh_bitmap, map)
|| (total_size - offsetof(bh_bitmap, map)) != bitmap_size) {
return NULL; /* integer overflow */
}
if ((bitmap = BH_MALLOC(total_size)) != NULL) {
memset(bitmap, 0, total_size);
bitmap->begin_index = begin_index;
bitmap->end_index = begin_index + bitnum;
}
return bitmap;
}