github
/
cranelift
mirror of https://github.com/bytecodealliance/wasmtime.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Update wasm-tools crates (#5130) 

* Update wasm-tools crates

Mostly just a hygienic update, nothing major here

* Fix fuzz compile

* Fix test expectations
pull/5134/head
Alex Crichton 2 years ago
committed by GitHub
parent
4867813f77
commit
bc3285e845
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 85 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 38
      Cargo.lock
  2. 14
      Cargo.toml
  3. 6
      cranelift/wasm/src/code_translator.rs
  4. 4
      crates/fuzzing/src/generators/single_inst_module.rs
  5. 2
      crates/fuzzing/src/generators/table_ops.rs
  6. 53
      supply-chain/audits.toml

38
Cargo.lock
View File

@ -80,9 +80,9 @@ checksum = "ec8ad6edb4840b78c5c3d88de606b22252d552b55f3a4699fbb10fc070ec3049"
[[package]]
name = "anyhow"
version = "1.0.57"
version = "1.0.66"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08f9b8508dccb7687a1d6c4ce66b2b0ecef467c94667de27d8d7fe1f8d2a9cdc"
checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6"
[[package]]
name = "arbitrary"
@ -3255,18 +3255,18 @@ checksum = "d554b7f530dee5964d9a9468d95c1f8b8acae4f282807e7d27d4b03099a46744"
[[package]]
name = "wasm-encoder"
version = "0.18.0"
version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c64ac98d5d61192cc45c701b7e4bd0b9aff91e2edfc7a088406cfe2288581e2c"
checksum = "c5816e88e8ea7335016aa62eb0485747f786136d505a9b3890f8c400211d9b5f"
dependencies = [
"leb128",
]
[[package]]
name = "wasm-mutate"
version = "0.2.9"
version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "00f7cead43549f0307a400df44218c00ccd9b275ed87edb8862b99b000dc9011"
checksum = "95d890340857014cfaad5db9d37154416de7110520ee515b0d9b1d7f29c7b137"
dependencies = [
"egg",
"log",
@ -3278,9 +3278,9 @@ dependencies = [
[[package]]
name = "wasm-smith"
version = "0.11.6"
version = "0.11.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "16f88ad106766ae5817d526cbf70576e4fdb4356ccf6814adff5a8553964feba"
checksum = "f89c6660d167214d00fc9e906c75ac1b1c22e1ca6f82f379440d804b63e6fcd5"
dependencies = [
"arbitrary",
"flagset",
@ -3331,9 +3331,9 @@ dependencies = [
[[package]]
name = "wasmparser"
version = "0.92.0"
version = "0.93.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7da34cec2a8c23db906cdf8b26e988d7a7f0d549eb5d51299129647af61a1b37"
checksum = "c5a4460aa3e271fa180b6a5d003e728f3963fb30e3ba0fa7c9634caa06049328"
dependencies = [
"indexmap",
]
@ -3349,9 +3349,9 @@ dependencies = [
[[package]]
name = "wasmprinter"
version = "0.2.41"
version = "0.2.42"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca4374ec27194a12b85aa0e1681a42d5800e97f11c036fa85dea8087c8ccb10b"
checksum = "6c9f096ba095329c6aa55b7e9cafa26c5b50e9ab7fc2415fd0b26cb80dca8f05"
dependencies = [
"anyhow",
"wasmparser",
@ -3497,7 +3497,7 @@ dependencies = [
"wasmtime-wasi-crypto",
"wasmtime-wasi-nn",
"wasmtime-wast",
"wast 47.0.1",
"wast 48.0.0",
"wat",
"windows-sys",
]
@ -3766,7 +3766,7 @@ dependencies = [
"anyhow",
"log",
"wasmtime",
"wast 47.0.1",
"wast 48.0.0",
]
[[package]]
@ -3780,9 +3780,9 @@ dependencies = [
[[package]]
name = "wast"
version = "47.0.1"
version = "48.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "02b98502f3978adea49551e801a6687678e6015317d7d9470a67fe813393f2a8"
checksum = "84825b5ac7164df8260c9e2b2e814075334edbe7ac426f2469b93a5eeac23cce"
dependencies = [
"leb128",
"memchr",
@ -3792,11 +3792,11 @@ dependencies = [
[[package]]
name = "wat"
version = "1.0.49"
version = "1.0.50"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7aab4e20c60429fbba9670a6cae0fff9520046ba0aa3e6d0b1cd2653bea14898"
checksum = "129da4a03ec6d2a815f42c88f641824e789d5be0d86d2f90aa8a218c7068e0be"
dependencies = [
"wast 47.0.1",
"wast 48.0.0",
]
[[package]]

14
Cargo.toml
View File

@ -148,13 +148,13 @@ cranelift = { path = "cranelift/umbrella", version = "0.90.0" }
target-lexicon = { version = "0.12.3", default-features = false }
anyhow = "1.0.22"
wasmparser = "0.92.0"
wat = "1.0.49"
wast = "47.0.1"
wasmprinter = "0.2.41"
wasm-encoder = "0.18.0"
wasm-smith = "0.11.6"
wasm-mutate = "0.2.9"
wasmparser = "0.93.0"
wat = "1.0.50"
wast = "48.0.0"
wasmprinter = "0.2.42"
wasm-encoder = "0.19.0"
wasm-smith = "0.11.7"
wasm-mutate = "0.2.10"
windows-sys = "0.36.0"
env_logger = "0.9"
rustix = "0.35.10"

6
cranelift/wasm/src/code_translator.rs
View File

@ -1584,7 +1584,7 @@ pub fn translate_operator<FE: FuncEnvironment + ?Sized>(
let (a, b) = pop2_with_bitcast(state, type_of(op), builder);
state.push1(builder.ins().umax(a, b))
}
Operator::I8x16RoundingAverageU | Operator::I16x8RoundingAverageU => {
Operator::I8x16AvgrU | Operator::I16x8AvgrU => {
let (a, b) = pop2_with_bitcast(state, type_of(op), builder);
state.push1(builder.ins().avg_round(a, b))
}
@ -2735,7 +2735,7 @@ fn type_of(operator: &Operator) -> Type {
| Operator::I8x16MinU
| Operator::I8x16MaxS
| Operator::I8x16MaxU
| Operator::I8x16RoundingAverageU
| Operator::I8x16AvgrU
| Operator::I8x16Bitmask
| Operator::I8x16Popcnt => I8X16,
@ -2772,7 +2772,7 @@ fn type_of(operator: &Operator) -> Type {
| Operator::I16x8MinU
| Operator::I16x8MaxS
| Operator::I16x8MaxU
| Operator::I16x8RoundingAverageU
| Operator::I16x8AvgrU
| Operator::I16x8Mul
| Operator::I16x8Bitmask => I16X8,

4
crates/fuzzing/src/generators/single_inst_module.rs
View File

@ -452,7 +452,7 @@ static INSTRUCTIONS: &[SingleInstModule] = &[
inst!(I8x16MinU, (v128, v128) -> v128, |c| c.config.simd_enabled),
inst!(I8x16MaxS, (v128, v128) -> v128, |c| c.config.simd_enabled),
inst!(I8x16MaxU, (v128, v128) -> v128, |c| c.config.simd_enabled),
inst!(I8x16RoundingAverageU, (v128, v128) -> v128, |c| c.config.simd_enabled),
inst!(I8x16AvgrU, (v128, v128) -> v128, |c| c.config.simd_enabled),
inst!(I16x8ExtAddPairwiseI8x16S, (v128) -> v128, |c| c.config.simd_enabled),
inst!(I16x8ExtAddPairwiseI8x16U, (v128) -> v128, |c| c.config.simd_enabled),
inst!(I16x8Abs, (v128) -> v128, |c| c.config.simd_enabled),
@ -480,7 +480,7 @@ static INSTRUCTIONS: &[SingleInstModule] = &[
inst!(I16x8MinU, (v128, v128) -> v128, |c| c.config.simd_enabled),
inst!(I16x8MaxS, (v128, v128) -> v128, |c| c.config.simd_enabled),
inst!(I16x8MaxU, (v128, v128) -> v128, |c| c.config.simd_enabled),
inst!(I16x8RoundingAverageU, (v128, v128) -> v128, |c| c.config.simd_enabled),
inst!(I16x8AvgrU, (v128, v128) -> v128, |c| c.config.simd_enabled),
inst!(I16x8ExtMulLowI8x16S, (v128, v128) -> v128, |c| c.config.simd_enabled),
inst!(I16x8ExtMulHighI8x16S, (v128, v128) -> v128, |c| c.config.simd_enabled),
inst!(I16x8ExtMulLowI8x16U, (v128, v128) -> v128, |c| c.config.simd_enabled),

2
crates/fuzzing/src/generators/table_ops.rs
View File

@ -325,7 +325,7 @@ mod tests {
(import "" "make_refs" (func (;2;) (type 3)))
(func (;3;) (type 1) (param externref externref externref externref externref externref externref externref externref externref)
(local externref)
loop ;; label = @1
loop ;; label = @1
call 0
call 2
call 1

53
supply-chain/audits.toml
View File

@ -1,6 +1,17 @@
# cargo-vet audits file
[[audits.anyhow]]
who = "Alex Crichton <alex@alexcrichton.com>"
criteria = "safe-to-deploy"
delta = "1.0.62 -> 1.0.66"
notes = """
This update looks to be related to minor fixes and mostly integrating with a
nightly feature in the standard library for backtrace integration. No undue
`unsafe` is added and nothing unsurprising for the `anyhow` crate is happening
here.
"""
[[audits.arbitrary]]
who = "Nick Fitzgerald <fitzgen@gmail.com>"
criteria = "safe-to-deploy"
@ -323,6 +334,12 @@ criteria = "safe-to-deploy"
version = "0.18.0"
notes = "The Bytecode Alliance is the author of this crate."
[[audits.wasm-encoder]]
who = "Alex Crichton <alex@alexcrichton.com>"
criteria = "safe-to-deploy"
version = "0.19.0"
notes = "The Bytecode Alliance is the author of this crate."
[[audits.wasm-mutate]]
who = "Alex Crichton <alex@alexcrichton.com>"
criteria = "safe-to-deploy"
@ -353,6 +370,12 @@ criteria = "safe-to-deploy"
version = "0.2.9"
notes = "The Bytecode Alliance is the author of this crate."
[[audits.wasm-mutate]]
who = "Alex Crichton <alex@alexcrichton.com>"
criteria = "safe-to-run"
version = "0.2.10"
notes = "The Bytecode Alliance is the author of this crate."
[[audits.wasm-smith]]
who = "Alex Crichton <alex@alexcrichton.com>"
criteria = "safe-to-deploy"
@ -383,6 +406,12 @@ criteria = "safe-to-deploy"
version = "0.11.6"
notes = "The Bytecode Alliance is the author of this crate."
[[audits.wasm-smith]]
who = "Alex Crichton <alex@alexcrichton.com>"
criteria = "safe-to-run"
version = "0.11.7"
notes = "The Bytecode Alliance is the author of this crate."
[[audits.wasmi_arena]]
who = "Alex Crichton <alex@alexcrichton.com>"
criteria = "safe-to-run"
@ -440,6 +469,12 @@ criteria = "safe-to-deploy"
version = "0.92.0"
notes = "The Bytecode Alliance is the author of this crate."
[[audits.wasmparser]]
who = "Alex Crichton <alex@alexcrichton.com>"
criteria = "safe-to-deploy"
version = "0.93.0"
notes = "The Bytecode Alliance is the author of this crate."
[[audits.wasmparser-nostd]]
who = "Alex Crichton <alex@alexcrichton.com>"
criteria = "safe-to-run"
@ -481,6 +516,12 @@ criteria = "safe-to-deploy"
version = "0.2.41"
notes = "The Bytecode Alliance is the author of this crate."
[[audits.wasmprinter]]
who = "Alex Crichton <alex@alexcrichton.com>"
criteria = "safe-to-deploy"
version = "0.2.42"
notes = "The Bytecode Alliance is the author of this crate."
[[audits.wast]]
who = "Alex Crichton <alex@alexcrichton.com>"
criteria = "safe-to-deploy"
@ -517,6 +558,12 @@ criteria = "safe-to-deploy"
version = "47.0.1"
notes = "The Bytecode Alliance is the author of this crate."
[[audits.wast]]
who = "Alex Crichton <alex@alexcrichton.com>"
criteria = "safe-to-deploy"
version = "48.0.0"
notes = "The Bytecode Alliance is the author of this crate."
[[audits.wat]]
who = "Alex Crichton <alex@alexcrichton.com>"
criteria = "safe-to-deploy"
@ -535,6 +582,12 @@ criteria = "safe-to-deploy"
version = "1.0.48"
notes = "The Bytecode Alliance is the author of this crate."
[[audits.wat]]
who = "Alex Crichton <alex@alexcrichton.com>"
criteria = "safe-to-deploy"
version = "1.0.50"
notes = "The Bytecode Alliance is the author of this crate."
[[audits.wat]]
who = "Alex Crichton <alex@alexcrichton.com>"
criteria = "safe-to-deploy"

Write Preview
Loading…
Cancel
Save