Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions RELEASES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
## 30.0.1

Released 2025-02-21.

### Fixed

* Fixes an issue building the `cranelift-assembler-x64` crate on Windows
when the Rust toolchain is on a different drive than the project using
`wasmtime`. For more details, see the [Zulip discussion]. [#10270]

[Zulip discussion]: https://bytecodealliance.zulipchat.com/#narrow/channel/217126-wasmtime/topic/Wasmtime.2030.20x64.20assembler.20build.20error.20on.20Windows
[#10270]: https://github.com/bytecodealliance/wasmtime/pull/10270

Comment thread
abrown marked this conversation as resolved.
--------------------------------------------------------------------------------

## 30.0.0

Released 2025-02-20.
Expand Down
18 changes: 10 additions & 8 deletions cranelift/assembler-x64/build.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
use cranelift_assembler_x64_meta as meta;
use std::env;
use std::fs::File;
use std::io::Write;
use std::path::Path;

fn main() {
Expand All @@ -13,12 +15,12 @@ fn main() {
meta::generate_isle_definitions(out_dir.join("assembler-definitions.isle")),
];

println!(
"cargo:rustc-env=ASSEMBLER_BUILT_FILES={}",
built_files
.iter()
.map(|p| p.to_string_lossy().to_string())
.collect::<Vec<_>>()
.join(":")
);
// Generating this additional bit of Rust is necessary for listing the
// generated files.
let mut vec_of_built_files = File::create(out_dir.join("generated-files.rs")).unwrap();
writeln!(vec_of_built_files, "vec![").unwrap();
for file in &built_files {
writeln!(vec_of_built_files, " {:?}.into(),", file.display()).unwrap();
}
writeln!(vec_of_built_files, "]").unwrap();
}
6 changes: 2 additions & 4 deletions cranelift/assembler-x64/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,7 @@ pub use reg::{Gpr, NonRspGpr, Size};
pub use rex::RexFlags;

/// List the files generated to create this assembler.
#[must_use]
pub fn generated_files() -> Vec<std::path::PathBuf> {
env!("ASSEMBLER_BUILT_FILES")
.split(':')
.map(std::path::PathBuf::from)
.collect()
include!(concat!(env!("OUT_DIR"), "/generated-files.rs"))
}
24 changes: 24 additions & 0 deletions supply-chain/audits.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,22 @@ start = "2021-10-29"
end = "2025-07-30"
notes = "The Bytecode Alliance is the author of this crate."

[[wildcard-audits.cranelift-assembler-x64]]
who = "Saúl Cabrera <saulecabrera@gmail.com>"
criteria = "safe-to-deploy"
user-id = 73222 # wasmtime-publish
start = "2025-02-20"
end = "2026-02-20"
notes = "The Bytecode Alliance is the author of this crate"

[[wildcard-audits.cranelift-assembler-x64-meta]]
who = "Saúl Cabrera <saulecabrera@gmail.com>"
criteria = "safe-to-deploy"
user-id = 73222 # wasmtime-publish
start = "2025-02-20"
end = "2026-02-20"
notes = "The Bytecode Alliance is the author of this crate."

[[wildcard-audits.cranelift-bforest]]
who = "Bobby Holley <bobbyholley@gmail.com>"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -557,6 +573,14 @@ start = "2023-05-22"
end = "2025-07-30"
notes = "The Bytecode Alliance is the author of this crate."

[[wildcard-audits.wasmtime-wasi-io]]
who = "Saúl Cabrera <saulecabrera@gmail.com>"
criteria = "safe-to-deploy"
user-id = 73222 # wasmtime-publish
start = "2025-02-20"
end = "2026-02-20"
notes = "The Bytecode Alliance is the author of this crate."

[[wildcard-audits.wasmtime-wasi-keyvalue]]
who = "Alex Crichton <alex@alexcrichton.com>"
criteria = "safe-to-deploy"
Expand Down
9 changes: 9 additions & 0 deletions supply-chain/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,15 @@ url = "https://raw.githubusercontent.com/mozilla/supply-chain/main/audits.toml"
[policy.cranelift]
audit-as-crates-io = true

[policy.cranelift-assembler-x64]
audit-as-crates-io = true

[policy.cranelift-assembler-x64-fuzz]
criteria = []

[policy.cranelift-assembler-x64-meta]
audit-as-crates-io = true

[policy.cranelift-bforest]
audit-as-crates-io = true

Expand Down Expand Up @@ -163,6 +169,9 @@ audit-as-crates-io = true
[policy.wasmtime-wasi-http]
audit-as-crates-io = true

[policy.wasmtime-wasi-io]
audit-as-crates-io = true

[policy.wasmtime-wasi-keyvalue]
audit-as-crates-io = true

Expand Down
38 changes: 38 additions & 0 deletions supply-chain/imports.lock
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,18 @@ audited_as = "0.114.0"
version = "0.117.0"
audited_as = "0.115.0"

[[unpublished.cranelift]]
version = "0.118.0"
audited_as = "0.116.1"

[[unpublished.cranelift-assembler-x64]]
version = "0.118.0"
audited_as = "0.117.0"

[[unpublished.cranelift-assembler-x64-meta]]
version = "0.118.0"
audited_as = "0.117.0"

[[unpublished.cranelift-bforest]]
version = "0.115.0"
audited_as = "0.113.1"
Expand Down Expand Up @@ -437,6 +449,14 @@ audited_as = "27.0.0"
version = "30.0.0"
audited_as = "28.0.0"

[[unpublished.wasmtime-wasi-http]]
version = "31.0.0"
audited_as = "29.0.1"

[[unpublished.wasmtime-wasi-io]]
version = "31.0.0"
audited_as = "30.0.0"

[[unpublished.wasmtime-wasi-keyvalue]]
version = "28.0.0"
audited_as = "26.0.1"
Expand Down Expand Up @@ -782,6 +802,18 @@ when = "2024-12-20"
user-id = 73222
user-login = "wasmtime-publish"

[[publisher.cranelift-assembler-x64]]
version = "0.117.0"
when = "2025-02-20"
user-id = 73222
user-login = "wasmtime-publish"

[[publisher.cranelift-assembler-x64-meta]]
version = "0.117.0"
when = "2025-02-20"
user-id = 73222
user-login = "wasmtime-publish"

[[publisher.cranelift-bforest]]
version = "0.115.0"
when = "2024-12-20"
Expand Down Expand Up @@ -1517,6 +1549,12 @@ when = "2024-12-20"
user-id = 73222
user-login = "wasmtime-publish"

[[publisher.wasmtime-wasi-io]]
version = "30.0.0"
when = "2025-02-20"
user-id = 73222
user-login = "wasmtime-publish"

[[publisher.wasmtime-wasi-keyvalue]]
version = "28.0.0"
when = "2024-12-20"
Expand Down