support gc opcode generated by binaryen #2110
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
wenyongh
reviewed
Apr 7, 2023
wenyongh
reviewed
Apr 10, 2023
Comment on lines
2392
to
2394
| if (dst_offset + len >= wasm_array_obj_length(dst_obj) | ||
| || src_offset + len | ||
| >= wasm_array_obj_length(src_obj)) { |
There was a problem hiding this comment.
Integer overflow may happen in dst_offset + len and src_offset + len. And when len is 0, it should be allowed? Had better be like below?
if (len > 0) {
if (dst_offset + len > dst_offset
|| dst_offset + len >= wasm_array_obj_length(dst_obj)
|| src_offset + len > src_offset
|| src_offset + len >= wasm_array_obj_length(src_obj)) {
wasm_set_exception(module, "array index out of bounds");
goto got_exception;
}
wasm_array_obj_copy(dst_obj, dst_offset, src_obj,
src_offset, len);
}
HANDLE_OP_END();There was a problem hiding this comment.
Thanks
Using dst_offset + len < dst_offset to check overflow actually triggers an overflow, which is not guaranteed by C standard, so I changed the operand to uint64 and check if the result exceeds UINT32_MAX
| wasm_set_exception(module, "null array object"); | ||
| goto got_exception; | ||
| } | ||
| if (dst_offset + len >= wasm_array_obj_length(dst_obj) |
core/iwasm/interpreter/wasm_loader.c
Outdated
| #if WASM_ENABLE_FAST_INTERP != 0 | ||
| emit_uint32(loader_ctx, type_idx); | ||
| #endif | ||
| /* typeidx1 */ |
There was a problem hiding this comment.
Thanks, done
wenyongh
reviewed
Apr 10, 2023
| } | ||
|
|
||
| if (len > 0) { | ||
| if (((uint64)dst_offset + (uint64)len >= UINT32_MAX) |
There was a problem hiding this comment.
= should be allowed. And how about checking it according to SDL rule:
len > UINT32_MAX - dst_offset
We used it in:
https://github.com/bytecodealliance/wasm-micro-runtime/blob/main/core/iwasm/common/wasm_memory.c#L277-L278
| if (len > 0) { | ||
| if (((uint64)dst_offset + (uint64)len >= UINT32_MAX) | ||
| || (dst_offset + len | ||
| >= wasm_array_obj_length(dst_obj)) |
Comment on lines
2227
to
2233
| if (((uint64)dst_offset + (uint64)len >= UINT32_MAX) | ||
| || (dst_offset + len | ||
| >= wasm_array_obj_length(dst_obj)) | ||
| || ((uint64)src_offset + (uint64)len | ||
| >= UINT32_MAX) | ||
| || (src_offset + len | ||
| >= wasm_array_obj_length(src_obj))) { |
wenyongh
reviewed
Apr 10, 2023
wenyongh
added a commit
to wenyongh/wasm-micro-runtime
that referenced
this pull request
Apr 18, 2023
Support GC opcodes generated by binaryen (bytecodealliance#2110)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.