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

Merge with upstream #7

Merged
merged 7 commits into from
Apr 19, 2024
Merged

Merge with upstream #7

merged 7 commits into from
Apr 19, 2024

Conversation

dhil
Copy link
Member

@dhil dhil commented Apr 19, 2024

No description provided.

github-actions bot and others added 7 commits April 2, 2024 20:19
[automatically-tag-and-release-this-commit]

Co-authored-by: Auto Release Process <[email protected]>
…es (bytecodealliance#919)

* test(*): hardening codegen tests by adding wasi proposals as submodules

this commit adds a few git submodules for wasi proposals and placed them
in `tests/codegen` folder for testing purposes. it also changes the structure
now that it requires wit packages to have a `wit` folder inside the directory
similar to how wasi proposal structures.

Signed-off-by: Jiaxiao Zhou (Mossaka) <[email protected]>

* test(rust): skip wasi-http and wasi-cli

both have multiple worlds which require another refactoring of the
current test codebase to adopt that

Signed-off-by: Jiaxiao Zhou (Mossaka) <[email protected]>

* test(*): skip wasi-* tests on teavm and csharp

Signed-off-by: Jiaxiao Zhou (Mossaka) <[email protected]>

---------

Signed-off-by: Jiaxiao Zhou (Mossaka) <[email protected]>
adds a command to initialize the Go directory and repalces Pirnt to HostPrint

Signed-off-by: Jiaxiao Zhou (Mossaka) <[email protected]>
…on (bytecodealliance#928)

* Use a unique name for `libwit_bindgen_cabi_realloc.a` per-crate-version

This commit updates how the weak `cabi_realloc` symbol is linked.
Previously rustc was told to use `-lwit_bindgen_cabi_realloc` with a
`-L` pointing to the source directory of the crate which has a
precompiled copy. This caused issues, however, when two versions were
present in a crate graph but only one was used. With two versions
present in a crate graph rustc would use two `-L` flags with directories
that both contain the same-named library. Which one was picked depended
on the order that rustc passed flags. If only one crate was used,
however, then rustc would not pass the rlib for the other crate. This
could end up in a situation where with two wit-bindgen versions A and B:

* During linking, A's `libwit_bindgen_cabi_realloc.a` file was used.
* Rustc only passed B's rlib since A wasn't actually used anywhere.
* The linker then tried to load A's version of the actual cabi_realloc
  symbol, but only B's was present.

The fix in this commit is to uniquely name the library name based on the
crate version. This matches how the symbol name is different per crate
version, for example.

* Remove copy/paste
@dhil dhil merged commit a0483a0 into wasmfx:main Apr 19, 2024
12 checks passed
@dhil dhil deleted the wasmfx-merge branch April 19, 2024 10:28
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.

4 participants