Skip to content

Merge branch main into dev/shared_heap#3613

Merged
wenyongh merged 18 commits intodev/shared_heapfrom
main
Jul 10, 2024
Merged

Merge branch main into dev/shared_heap#3613
wenyongh merged 18 commits intodev/shared_heapfrom
main

Conversation

@wenyongh
Copy link
Collaborator

No description provided.

bnason-nf and others added 18 commits June 27, 2024 14:34
eg.
```shell
cmake .. \
-DCMAKE_C_COMPILER=/usr/local/opt/llvm@15/bin/clang \
-DCMAKE_CXX_COMPILER=/usr/local/opt/llvm@15/bin/clang++
```
We need to fix numpy version since the latest is incompatible.

> A module that was compiled using NumPy 1.x cannot be run in
NumPy 2.0.0 as it may crash. To support both 1.x and 2.x
versions of NumPy, modules must be compiled with NumPy 2.0.
Some module may need to rebuild instead e.g. with 'pybind11>=2.12'.
The `exec_env->current_status->step_count` should be set same as the handling
when WASM_ENABLE_LABELS_AS_VALUES is not 0.

Fixes issue #3475.
Corrected compilation failures due to structure changes, like AOTImportTable.
CMAKE_C_COMPILER etc should be set before project(),
in which cmake tries to decide which compiler to use.
* macOS doesn't have -lrt.

* this program doesn't seem to require librt even on ubuntu.

build tested on macOS and ubuntu.
Check whether the indices overflow UINT32_MAX or not for:
- import function count + function count
- import global count + global count
- import tag count + tag count

This PR fixes the issue reported by Oss-fuzz test (#69920).
Add missing reloc entries for Arm AOT. Also sort and remove duplicate.
https://developer.android.com/ndk/guides/stable_apis#core_cc

> Note that on Android, unlike Linux, there are no separate libpthread or librt libraries.
That functionality is included directly in libc, which does not need to be explicitly linked against.

Set `THREADS_PREFER_PTHREAD_FLAG` ON and find package `Threads`, then link
`${CMAKE_THREAD_LIBS_INIT}` instead of `-lpthread`.

ps.
https://cmake.org/cmake/help/latest/module/FindThreads.html
Fix several issues of GC and exception handling in wasm loader:
- Should restore param_reftype_maps/param_reftype_map_count/param_count
  in the handling of opcode throw
- Should set wasm_ref_type when pushing param types of tag type and block type
  if the type is a multi-byte type
- Should set init_values.data as NULL for opcode struct.new_default in load_init_expr

This PR fixes the issues reported in #3411.
…package_type() (#3600)

wasm_runtime_get_file_package_type() is the counterpart of get_file_package_type().

See discussion in #3595.
Bumps [ocaml/setup-ocaml](https://github.com/ocaml/setup-ocaml) from 2 to 3.
- [Release notes](https://github.com/ocaml/setup-ocaml/releases)
- [Changelog](https://github.com/ocaml/setup-ocaml/blob/master/CHANGELOG.md)
- [Commits](ocaml/setup-ocaml@v2...v3)

---
updated-dependencies:
- dependency-name: ocaml/setup-ocaml
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@wenyongh wenyongh merged commit 84411c6 into dev/shared_heap Jul 10, 2024
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.

8 participants