diff --git a/Cargo.lock b/Cargo.lock index 6907d9a64..8f083b336 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6,7 +6,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a49806b9dadc843c61e7c97e72490ad7f7220ae249012fbda9ad0609457c0543" dependencies = [ - "gimli 0.21.0", + "gimli", ] [[package]] @@ -306,21 +306,21 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.64.0" +version = "0.65.0" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.64.0" +version = "0.65.0" dependencies = [ "byteorder", "cranelift-bforest", "cranelift-codegen-meta", "cranelift-codegen-shared", "cranelift-entity", - "gimli 0.20.0", + "gimli", "log", "regalloc", "smallvec", @@ -330,7 +330,7 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.64.0" +version = "0.65.0" dependencies = [ "cranelift-codegen-shared", "cranelift-entity", @@ -338,15 +338,15 @@ dependencies = [ [[package]] name = "cranelift-codegen-shared" -version = "0.64.0" +version = "0.65.0" [[package]] name = "cranelift-entity" -version = "0.64.0" +version = "0.65.0" [[package]] name = "cranelift-frontend" -version = "0.64.0" +version = "0.65.0" dependencies = [ "cranelift-codegen", "log", @@ -356,7 +356,7 @@ dependencies = [ [[package]] name = "cranelift-module" -version = "0.64.0" +version = "0.65.0" dependencies = [ "anyhow", "cranelift-codegen", @@ -367,7 +367,7 @@ dependencies = [ [[package]] name = "cranelift-native" -version = "0.64.0" +version = "0.65.0" dependencies = [ "cranelift-codegen", "raw-cpuid 7.0.3", @@ -376,17 +376,18 @@ dependencies = [ [[package]] name = "cranelift-object" -version = "0.64.0" +version = "0.65.0" dependencies = [ + "anyhow", "cranelift-codegen", "cranelift-module", - "object 0.18.0", + "object 0.19.0", "target-lexicon", ] [[package]] name = "cranelift-wasm" -version = "0.64.0" +version = "0.65.0" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -680,20 +681,13 @@ dependencies = [ [[package]] name = "gimli" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dd6190aad0f05ddbbf3245c54ed14ca4aa6dd32f22312b70d8f168c3e3e633" +checksum = "bcc8e0c9bce37868955864dbecd2b1ab2bdf967e6f28066d65aaac620444b65c" dependencies = [ - "byteorder", "indexmap", ] -[[package]] -name = "gimli" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcc8e0c9bce37868955864dbecd2b1ab2bdf967e6f28066d65aaac620444b65c" - [[package]] name = "glob" version = "0.2.11" @@ -1164,7 +1158,7 @@ dependencies = [ "lucet-wiggle-generate", "memoffset", "minisign", - "object 0.18.0", + "object 0.19.0", "raw-cpuid 6.1.0", "serde", "serde_json", @@ -1307,9 +1301,7 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5666bbb90bc4d1e5bdcb26c0afda1822d25928341e9384ab187a9b37ab69e36" dependencies = [ - "crc32fast", "flate2", - "indexmap", "target-lexicon", "wasmparser 0.51.4", ] @@ -1319,6 +1311,10 @@ name = "object" version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9cbca9424c482ee628fa549d9c812e2cd22f1180b9222c9200fdfa6eb31aecb2" +dependencies = [ + "crc32fast", + "indexmap", +] [[package]] name = "oorandom" @@ -1702,9 +1698,9 @@ checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" [[package]] name = "regalloc" -version = "0.0.25" +version = "0.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cca5b48c9db66c5ba084e4660b4c0cfe8b551a96074bc04b7c11de86ad0bf1f9" +checksum = "7c03092d79e0fd610932d89ed53895a38c0dd3bcd317a0046e69940de32f1d95" dependencies = [ "log", "rustc-hash", @@ -2284,7 +2280,7 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] name = "wasi-common" -version = "0.17.0" +version = "0.18.0" dependencies = [ "anyhow", "cfg-if", @@ -2395,7 +2391,7 @@ dependencies = [ [[package]] name = "wig" -version = "0.17.0" +version = "0.18.0" dependencies = [ "heck", "proc-macro2 1.0.13", @@ -2405,7 +2401,7 @@ dependencies = [ [[package]] name = "wiggle" -version = "0.17.0" +version = "0.18.0" dependencies = [ "thiserror", "tracing", @@ -2415,7 +2411,7 @@ dependencies = [ [[package]] name = "wiggle-generate" -version = "0.17.0" +version = "0.18.0" dependencies = [ "anyhow", "heck", @@ -2427,7 +2423,7 @@ dependencies = [ [[package]] name = "wiggle-macro" -version = "0.17.0" +version = "0.18.0" dependencies = [ "quote 1.0.6", "syn 1.0.22", @@ -2437,7 +2433,7 @@ dependencies = [ [[package]] name = "wiggle-test" -version = "0.17.0" +version = "0.18.0" dependencies = [ "proptest", "wiggle", @@ -2488,7 +2484,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "winx" -version = "0.17.0" +version = "0.18.0" dependencies = [ "bitflags 1.2.1", "cvt", @@ -2513,7 +2509,7 @@ checksum = "da90eac47bf1d7871b75004b9b631d107df15f37669383b23f0b5297bc7516b6" [[package]] name = "yanix" -version = "0.17.0" +version = "0.18.0" dependencies = [ "bitflags 1.2.1", "cfg-if", diff --git a/lucet-module/Cargo.toml b/lucet-module/Cargo.toml index 4c6c719f2..33371a06d 100644 --- a/lucet-module/Cargo.toml +++ b/lucet-module/Cargo.toml @@ -11,7 +11,7 @@ edition = "2018" [dependencies] anyhow = "1.0" -cranelift-entity = { path = "../wasmtime/cranelift/entity", version = "0.64.0" } +cranelift-entity = { path = "../wasmtime/cranelift/entity", version = "0.65.0" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" bincode = "1.1.4" diff --git a/lucet-validate/Cargo.toml b/lucet-validate/Cargo.toml index e6f7c06ff..502204f64 100644 --- a/lucet-validate/Cargo.toml +++ b/lucet-validate/Cargo.toml @@ -19,7 +19,7 @@ path = "src/main.rs" [dependencies] clap = "2" witx = { path = "../wasmtime/crates/wasi-common/WASI/tools/witx", version = "0.8.5" } -cranelift-entity = { path = "../wasmtime/cranelift/entity", version = "0.64.0" } +cranelift-entity = { path = "../wasmtime/cranelift/entity", version = "0.65.0" } thiserror = "1.0.4" wasmparser = "0.52.0" diff --git a/lucet-wasi/Cargo.toml b/lucet-wasi/Cargo.toml index dd80248c1..74a39791d 100644 --- a/lucet-wasi/Cargo.toml +++ b/lucet-wasi/Cargo.toml @@ -22,7 +22,7 @@ lucet-wiggle = { path = "../lucet-wiggle", version = "=0.7.0-dev" } libc = "0.2.65" nix = "0.17" rand = "0.6" -wasi-common = { path = "../wasmtime/crates/wasi-common", version = "0.17.0", features = ["wiggle_metadata"] } +wasi-common = { path = "../wasmtime/crates/wasi-common", version = "0.18.0", features = ["wiggle_metadata"] } [dev-dependencies] lucet-wasi-sdk = { path = "../lucet-wasi-sdk" } diff --git a/lucet-wasi/generate/Cargo.toml b/lucet-wasi/generate/Cargo.toml index ba4889cab..e36394153 100644 --- a/lucet-wasi/generate/Cargo.toml +++ b/lucet-wasi/generate/Cargo.toml @@ -13,8 +13,8 @@ proc-macro = true [dependencies] lucet-wiggle = { path = "../../lucet-wiggle", version = "0.7.0-dev" } -wasi-common = { path = "../../wasmtime/crates/wasi-common", version = "0.17.0", features = ["wiggle_metadata"] } -wiggle-generate = { path = "../../wasmtime/crates/wiggle/generate", version = "0.17.0" } +wasi-common = { path = "../../wasmtime/crates/wasi-common", version = "0.18.0", features = ["wiggle_metadata"] } +wiggle-generate = { path = "../../wasmtime/crates/wiggle/generate", version = "0.18.0" } syn = { version = "1.0", features = ["full"] } quote = "1.0" proc-macro2 = "1.0" diff --git a/lucet-wiggle/Cargo.toml b/lucet-wiggle/Cargo.toml index 911f2fb14..38a9566a1 100644 --- a/lucet-wiggle/Cargo.toml +++ b/lucet-wiggle/Cargo.toml @@ -14,7 +14,7 @@ edition = "2018" lucet-wiggle-macro = { path = "./macro", version = "0.7.0-dev" } lucet-wiggle-generate = { path = "./generate", version = "0.7.0-dev" } lucet-runtime = { path = "../lucet-runtime", version = "0.7.0-dev" } -wiggle = { path = "../wasmtime/crates/wiggle", version = "0.17.0" } +wiggle = { path = "../wasmtime/crates/wiggle", version = "0.18.0" } [dev-dependencies] wiggle-test = { path = "../wasmtime/crates/wiggle/test-helpers" } diff --git a/lucet-wiggle/generate/Cargo.toml b/lucet-wiggle/generate/Cargo.toml index 2add756f1..fb6e8ed02 100644 --- a/lucet-wiggle/generate/Cargo.toml +++ b/lucet-wiggle/generate/Cargo.toml @@ -9,7 +9,7 @@ authors = ["Lucet team "] edition = "2018" [dependencies] -wiggle-generate = { path = "../../wasmtime/crates/wiggle/generate", version = "0.17.0" } +wiggle-generate = { path = "../../wasmtime/crates/wiggle/generate", version = "0.18.0" } lucet-module = { path = "../../lucet-module", version = "0.7.0-dev" } witx = { path = "../../wasmtime/crates/wasi-common/WASI/tools/witx", version = "0.8.4" } quote = "1.0" diff --git a/lucet-wiggle/macro/Cargo.toml b/lucet-wiggle/macro/Cargo.toml index dcfe9e778..b26e8377e 100644 --- a/lucet-wiggle/macro/Cargo.toml +++ b/lucet-wiggle/macro/Cargo.toml @@ -13,7 +13,7 @@ proc-macro = true [dependencies] lucet-wiggle-generate = { path = "../generate", version = "0.7.0-dev" } -wiggle-generate = { path = "../../wasmtime/crates/wiggle/generate", version = "0.17.0" } +wiggle-generate = { path = "../../wasmtime/crates/wiggle/generate", version = "0.18.0" } witx = { path = "../../wasmtime/crates/wasi-common/WASI/tools/witx", version = "0.8.4" } syn = { version = "1.0", features = ["full"] } quote = "1.0" diff --git a/lucetc/Cargo.toml b/lucetc/Cargo.toml index 59bd9551b..434f1b918 100644 --- a/lucetc/Cargo.toml +++ b/lucetc/Cargo.toml @@ -16,13 +16,13 @@ path = "lucetc/main.rs" [dependencies] anyhow = "1" bincode = "1.1.4" -cranelift-codegen = { path = "../wasmtime/cranelift/codegen", version = "0.64.0" } -cranelift-entity = { path = "../wasmtime/cranelift/entity", version = "0.64.0" } -cranelift-native = { path = "../wasmtime/cranelift/native", version = "0.64.0" } -cranelift-frontend = { path = "../wasmtime/cranelift/frontend", version = "0.64.0" } -cranelift-module = { path = "../wasmtime/cranelift/module", version = "0.64.0" } -cranelift-object = { path = "../wasmtime/cranelift/object", version = "0.64.0" } -cranelift-wasm = { path = "../wasmtime/cranelift/wasm", version = "0.64.0" } +cranelift-codegen = { path = "../wasmtime/cranelift/codegen", version = "0.65.0" } +cranelift-entity = { path = "../wasmtime/cranelift/entity", version = "0.65.0" } +cranelift-native = { path = "../wasmtime/cranelift/native", version = "0.65.0" } +cranelift-frontend = { path = "../wasmtime/cranelift/frontend", version = "0.65.0" } +cranelift-module = { path = "../wasmtime/cranelift/module", version = "0.65.0" } +cranelift-object = { path = "../wasmtime/cranelift/object", version = "0.65.0" } +cranelift-wasm = { path = "../wasmtime/cranelift/wasm", version = "0.65.0" } target-lexicon = "0.10" lucet-module = { path = "../lucet-module", version = "=0.7.0-dev" } lucet-validate = { path = "../lucet-validate", version = "=0.7.0-dev" } @@ -31,7 +31,7 @@ wasmparser = "0.57.0" clap="2.32" log = "0.4" env_logger = "0.6" -object = { version = "0.18.0", default-features = false, features = ["write"] } +object = { version = "0.19.0", default-features = false, features = ["write"] } byteorder = "1.2" wabt = "0.9.2" tempfile = "3.0" diff --git a/lucetc/src/compiler.rs b/lucetc/src/compiler.rs index af85ed47f..ff40d30bc 100644 --- a/lucetc/src/compiler.rs +++ b/lucetc/src/compiler.rs @@ -228,7 +228,7 @@ impl<'a> Compiler<'a> { _ => (cranelift_module::default_libcall_names())(libcall), }); - let mut builder = ObjectBuilder::new(isa, "lucet_guest".to_owned(), libcalls); + let mut builder = ObjectBuilder::new(isa, "lucet_guest".to_owned(), libcalls)?; builder.function_alignment(16); let mut clif_module: ClifModule = ClifModule::new(builder); diff --git a/wasmtime b/wasmtime index 3de418630..91980b29f 160000 --- a/wasmtime +++ b/wasmtime @@ -1 +1 @@ -Subproject commit 3de418630a263ca214931d69f796879be50d4f72 +Subproject commit 91980b29f771e79192d702573fc636e4ac7763a8