Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge bytecodealliance:main into wenyongh:main #930

Merged
merged 3 commits into from
Jun 21, 2024
Merged

Merge bytecodealliance:main into wenyongh:main #930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a16da4f
dwarf_extractor.cpp: Try to preserve link name (#3542)
yamt Jun 19, 2024
0418041
wasm_memory.c: Fix typo: `hasn't been initialize` -> `hasn't been ini…
LIII-XXII Jun 19, 2024
9b9e938
Fix compilation errors (#3549)
wenyongh Jun 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions core/iwasm/common/wasm_memory.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ wasm_runtime_malloc_internal(unsigned int size)
{
if (memory_mode == MEMORY_MODE_UNKNOWN) {
LOG_WARNING(
"wasm_runtime_malloc failed: memory hasn't been initialize.\n");
"wasm_runtime_malloc failed: memory hasn't been initialized.\n");
return NULL;
}
else if (memory_mode == MEMORY_MODE_POOL) {
Expand All @@ -215,7 +215,7 @@ wasm_runtime_realloc_internal(void *ptr, unsigned int size)
{
if (memory_mode == MEMORY_MODE_UNKNOWN) {
LOG_WARNING(
"wasm_runtime_realloc failed: memory hasn't been initialize.\n");
"wasm_runtime_realloc failed: memory hasn't been initialized.\n");
return NULL;
}
else if (memory_mode == MEMORY_MODE_POOL) {
Expand Down
4 changes: 2 additions & 2 deletions core/iwasm/compilation/aot_emit_aot_file.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1977,7 +1977,7 @@ aot_emit_table_info(uint8 *buf, uint8 *buf_end, uint32 *p_offset,
if (comp_ctx->enable_gc
&& comp_data->import_tables[i].table_type.elem_ref_type) {
bh_assert(wasm_is_type_multi_byte_type(
comp_data->import_tables[i].elem_type));
comp_data->import_tables[i].table_type.elem_type));
EMIT_U32(comp_data->import_tables[i]
.table_type.elem_ref_type->ref_ht_common.heap_type);
}
Expand Down Expand Up @@ -2009,7 +2009,7 @@ aot_emit_table_info(uint8 *buf, uint8 *buf_end, uint32 *p_offset,
if (comp_ctx->enable_gc) {
if (comp_data->tables[i].table_type.elem_ref_type) {
bh_assert(wasm_is_type_multi_byte_type(
comp_data->tables[i].elem_type));
comp_data->tables[i].table_type.elem_type));
EMIT_U32(
comp_data->tables[i]
.table_type.elem_ref_type->ref_ht_common.heap_type);
Expand Down
6 changes: 3 additions & 3 deletions core/iwasm/compilation/debug/dwarf_extractor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ lldb_function_to_function_dbi(const AOTCompContext *comp_ctx,
{
SBFunction function(sc.GetFunction());
const char *function_name = function.GetName();
const char *link_name = function.GetName();
const char *link_name = function.GetMangledName();
SBTypeList function_args = function.GetType().GetFunctionArgumentTypes();
SBType return_type = function.GetType().GetFunctionReturnType();
const size_t num_function_args = function_args.GetSize();
Expand Down Expand Up @@ -389,8 +389,8 @@ lldb_function_to_function_dbi(const AOTCompContext *comp_ctx,

LLVMMetadataRef FunctionMetadata = LLVMDIBuilderCreateFunction(
DIB, File, function_name, strlen(function_name), link_name,
strlen(link_name), File, line_entry.GetLine(), FunctionTy, true, true,
line_entry.GetLine(), LLVMDIFlagZero, false);
link_name != NULL ? strlen(link_name) : 0, File, line_entry.GetLine(),
FunctionTy, true, true, line_entry.GetLine(), LLVMDIFlagZero, false);

LLVMMetadataReplaceAllUsesWith(ReplaceableFunctionMetadata,
FunctionMetadata);
Expand Down
2 changes: 1 addition & 1 deletion core/iwasm/interpreter/wasm_mini_loader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,7 @@ load_table_import(const uint8 **p_buf, const uint8 *buf_end,
read_leb_uint32(p, p_end, declare_init_size);
if (declare_max_size_flag & 1) {
read_leb_uint32(p, p_end, declare_max_size);
bh_assert(table->init_size <= table->max_size);
bh_assert(table->table_type.init_size <= table->table_type.max_size);
}

adjust_table_max_size(declare_init_size, declare_max_size_flag,
Expand Down
Binary file removed tests/standalone/test-running-modes/wasm-apps/hello.wasm
View file
Open in desktop
Binary file not shown.
Binary file removed tests/standalone/test-running-modes/wasm-apps/mytest.wasm
View file
Open in desktop
Binary file not shown.
Loading