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.

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

Fix dynamic offset not updated in op_br for block with ret type #3269

Merged
merged 1 commit into from
Apr 1, 2024

Conversation

wenyongh
Copy link
Contributor

@wenyongh wenyongh commented Apr 1, 2024

Found the PR #3259
reverted PR #3192.

The issue is that we should update ctx->dynamic_offset only for opcode br and
should not update it for opcode br_if. This PR fixes both issue #3170 and #3210.

@xujuntwt95329
Copy link
Collaborator

LGTM

@wenyongh wenyongh merged commit 6ee7100 into bytecodealliance:main Apr 1, 2024
384 checks passed
@wenyongh wenyongh deleted the fix_dynamic_offset branch April 1, 2024 10:17
wenyongh added a commit that referenced this pull request Apr 3, 2024
Apply patches which were fixed branch main to branch `release/1.3.x`:
- zephyr: Use zephyr sys_cache instead of CMSIS (#3162)
- Fix llvm jit push funcref/externref result type issue (#3169)
- Fix inconsistent coding convention (#3171)
- VSCode IDE enhancement and readme update (#3172)
- zephyr: include math only with minimal libc (#3177)
- Fix wasm loader handling opcode br_table (#3176)
- Specify language in the wasi socket ext project (#3183)
- lldb_function_to_function_dbi: Fix a null dereference (#3189)
- Fix LLVM assertion failure and update CONTRIBUTING.md (#3197)
- lldb_function_to_function_dbi: A hack to avoid crashing on C++ methods (#3190)
- Fix compilation errors on MinGW (#3217)
- Fix compilation errors on esp-idf platform (#3224)
- Fix aot relocation symbols not found on windows 32-bit (#3231)
- Fix nightly run tsan ASLR issue (#3233)
- Go binding: Change C.long to C.int64_t when call wasm_runtime_set_wasi_args_ex (#3235)
- posix_file.c: Correct the dirfd argument that passes to fstatat (#3244)
- Fix compilation errors on zephyr platform (#3255)
- Fix dynamic offset not updated in op_br for block with ret type (#3269)
- Fix CI error when install packages for macos-14 (#3270)
victoryang00 pushed a commit to victoryang00/wamr-aot-gc-checkpoint-restore that referenced this pull request May 27, 2024
…codealliance#3269)

The PR bytecodealliance#3259 reverted PR bytecodealliance#3192, it fixes bytecodealliance#3210 but makes bytecodealliance#3170 failed again.

The workaround is that we should update `ctx->dynamic_offset` only for opcode br
and should not update it for opcode br_if. This PR fixes both issue bytecodealliance#3170 and bytecodealliance#3210.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants