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 #234

Merged
merged 9 commits into from
Oct 4, 2024
Merged

Merge with upstream #234

merged 9 commits into from
Oct 4, 2024

Conversation

dhil
Copy link
Member

@dhil dhil commented Oct 4, 2024

No description provided.

fitzgen and others added 9 commits October 2, 2024 19:58
…_gc_ref` (bytecodealliance#9359)

Don't just assert that the given GC refs aren't `i31ref`s, but also that they
are of the correct type.

Note that the other `from_cloned_gc_ref` methods (on, for example, `AnyRef`)
already do their equivalents of these checks. Just these two were a little
looser than they should have been.
…ecodealliance#9360)

* Disable tail-call when fuzzing the spec interpreter

Our copy of the reference interpreter does not implement the tail-call
proposal, so fix OSS-Fuzz by disabling it. This technically should have
been done in bytecodealliance#9336 when wasm-tools was updated to auto-try to enable
this proposal by default, but alas I am not a human fuzzer so I waited
until OSS-Fuzz found it.

* Also disable relaxed-simd
…nce#9362)

This commit fixes an issue found on OSS-Fuzz for the cranelift-fuzzgen
fuzzer which was caused by bytecodealliance#9338 but that PR forgot to fix.
…e#9371)

* Update pulley-interpreter and winch-codegen versions

Update these two crates to match the Wasmtime crate version instead of
having separate version tracks. Helps keep everything in-sync with
fewer versions to worry about in general.

* Update cargo-vet
This PR is intended to help unblock bytecodealliance#9178. That PR uncovered the
consequence that testing the `cranelift-reader` crate alone does not
work on non-x86_64 platforms. One of its tests relies on parsing the
`x86_64` target specification to work, and that only works if the `x86`
feature of the cranelift-codegen crate is enabled. This PR
unconditionally enables this feature when testing.

This was uncovered on bytecodealliance#9178 because the set of crates tested in each
shard of our sharded builders depends on the set of crates in the
workspace. When a new crate is added it may shuffle around which crates
are tested in which location. Previously `cranelift-reader` must have
been always tested with a crate that unconditionally enables
`cranelift-codegen/x86` as a feature, but bytecodealliance#9178 got unlucky where it
moved to a set that didn't include this, thus exposing the failure.
* Squash of verification changes 2024-08-28

* Cleanup

* fmt

* More cleanup

* clippy

* update example spec

* fmt

* null

* clippy part 1

* clippy fix, null

* clippy part 3

* fmt

* disable veri_engine tests in CI

* clap dependency

* remove strum

* use easy-smt version

* Get `cargo vet/deny` working and passing

Undoes a seeming `cargo update` that was performed previously and then
adds a vet for the new crate added.

* Flag new crates as not published

* Revert "remove strum"

This reverts commit df7b540.

* itertools

* Review feedback

* Future work comments for encodings

* fmt

* post merge Cargo.lock updates

* authors

---------

Co-authored-by: Alex Crichton <[email protected]>
There were a few missing pieces for the readme example to compile.
@dhil dhil merged commit 189926f into wasmfx:main Oct 4, 2024
40 checks passed
@dhil dhil deleted the wasmfx-merge branch October 4, 2024 16:59
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.

5 participants