From e6d56e8080705b97c41f3e4b19e191e798b7cb9b Mon Sep 17 00:00:00 2001 From: Andri Saar Date: Wed, 10 Jul 2024 13:29:00 +0000 Subject: [PATCH] Add support for x86_64-unknown-linux to oak_functions_service That is, use wasmtime and std. Bug: 349587510 Change-Id: I61f7be4d0e691d7feb743dd1cd96ead0537eeb25 --- Cargo.bazel.lock | 247 +-- WORKSPACE | 3 + bazel/crates/oak_crates_index.bzl | 14 +- cargo-bazel-lock.json | 1633 ++------------------ oak_functions_service/BUILD | 30 +- oak_functions_service/src/wasm/wasmtime.rs | 2 +- 6 files changed, 147 insertions(+), 1782 deletions(-) diff --git a/Cargo.bazel.lock b/Cargo.bazel.lock index 19cc04b24a..7f93e427e8 100644 --- a/Cargo.bazel.lock +++ b/Cargo.bazel.lock @@ -641,15 +641,6 @@ dependencies = [ "ciborium-io", ] -[[package]] -name = "cpp_demangle" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeaa953eaad386a53111e47172c2fedba671e5684c8dd601a5f474f4f118710f" -dependencies = [ - "cfg-if", -] - [[package]] name = "cpp_demangle" version = "0.4.3" @@ -1266,15 +1257,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "encoding_rs" -version = "0.8.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" -dependencies = [ - "cfg-if", -] - [[package]] name = "env_filter" version = "0.1.0" @@ -1498,28 +1480,6 @@ dependencies = [ "slab", ] -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - -[[package]] -name = "fxprof-processed-profile" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27d12c0aed7f1e24276a241aadc4cb8ea9f83000f34bc062b7cc2d51e3b0fabd" -dependencies = [ - "bitflags 2.5.0", - "debugid", - "fxhash", - "serde", - "serde_json", -] - [[package]] name = "generic-array" version = "0.14.7" @@ -1857,12 +1817,6 @@ dependencies = [ "cc", ] -[[package]] -name = "id-arena" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" - [[package]] name = "ident_case" version = "1.0.1" @@ -1971,26 +1925,6 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" -[[package]] -name = "ittapi" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b996fe614c41395cdaedf3cf408a9534851090959d90d54a535f675550b64b1" -dependencies = [ - "anyhow", - "ittapi-sys", - "log", -] - -[[package]] -name = "ittapi-sys" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52f5385394064fa2c886205dba02598013ce83d3e92d33dbdc0c52fe0e7bf4fc" -dependencies = [ - "cc", -] - [[package]] name = "jobserver" version = "0.1.31" @@ -3661,7 +3595,7 @@ version = "12.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "424fa2c9bf2c862891b9cfd354a752751a6730fd838a4691e7f6c2c7957b9daf" dependencies = [ - "cpp_demangle 0.4.3", + "cpp_demangle", "rustc-demangle", "symbolic-common", ] @@ -4149,12 +4083,6 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - [[package]] name = "universal-hash" version = "0.5.1" @@ -4299,15 +4227,6 @@ dependencies = [ "leb128", ] -[[package]] -name = "wasm-encoder" -version = "0.211.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e7d931a1120ef357f32b74547646b6fa68ea25e377772b72874b131a9ed70d4" -dependencies = [ - "leb128", -] - [[package]] name = "wasmi" version = "0.31.2" @@ -4359,33 +4278,18 @@ dependencies = [ "indexmap-nostd", ] -[[package]] -name = "wasmprinter" -version = "0.2.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60e73986a6b7fdfedb7c5bf9e7eb71135486507c8fbc4c0c42cffcb6532988b7" -dependencies = [ - "anyhow", - "wasmparser", -] - [[package]] name = "wasmtime" version = "18.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69472708b96ee90579a482bdbb908ce97e53a9e5ebbcab59cc29c3977bcab512" dependencies = [ - "addr2line", "anyhow", - "async-trait", "bincode", "bumpalo", "cfg-if", - "encoding_rs", - "fxprof-processed-profile", "gimli", "indexmap 2.2.6", - "ittapi", "libc", "log", "object", @@ -4397,19 +4301,12 @@ dependencies = [ "serde_derive", "serde_json", "target-lexicon", - "wasm-encoder 0.41.2", "wasmparser", "wasmtime-cache", - "wasmtime-component-macro", - "wasmtime-component-util", "wasmtime-cranelift", "wasmtime-environ", - "wasmtime-fiber", - "wasmtime-jit-debug", "wasmtime-jit-icache-coherence", "wasmtime-runtime", - "wasmtime-winch", - "wat", "windows-sys 0.52.0", ] @@ -4442,27 +4339,6 @@ dependencies = [ "zstd", ] -[[package]] -name = "wasmtime-component-macro" -version = "18.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc6aca484581f9651886dca45f9dea893e105713b58623d14b06c56d8fe3f3f1" -dependencies = [ - "anyhow", - "proc-macro2", - "quote", - "syn 2.0.58", - "wasmtime-component-util", - "wasmtime-wit-bindgen", - "wit-parser", -] - -[[package]] -name = "wasmtime-component-util" -version = "18.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aa907cc97ad039c43f98525d772f4841c2ce69a0c11eeec2a3a9c77fc730e87" - [[package]] name = "wasmtime-cranelift" version = "18.0.4" @@ -4512,51 +4388,19 @@ checksum = "abbf3075d9ee7eb1263dc67949aced64d0f0bf27be8098d34d8e5826cf0ff0f2" dependencies = [ "anyhow", "bincode", - "cpp_demangle 0.3.5", "cranelift-entity", "gimli", "indexmap 2.2.6", "log", "object", - "rustc-demangle", "serde", "serde_derive", "target-lexicon", "thiserror", - "wasm-encoder 0.41.2", "wasmparser", - "wasmprinter", - "wasmtime-component-util", "wasmtime-types", ] -[[package]] -name = "wasmtime-fiber" -version = "18.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3174f71c8fbd9d2cb1233ad9f912f106bdd2a1a6d11a1b7707974ba3ad5f304a" -dependencies = [ - "anyhow", - "cc", - "cfg-if", - "rustix", - "wasmtime-asm-macros", - "wasmtime-versioned-export-macros", - "windows-sys 0.52.0", -] - -[[package]] -name = "wasmtime-jit-debug" -version = "18.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b0462a46b80d2352ee553b17d626b6468e9cec2220cc58ac31754fd7b58245e" -dependencies = [ - "object", - "once_cell", - "rustix", - "wasmtime-versioned-export-macros", -] - [[package]] name = "wasmtime-jit-icache-coherence" version = "18.0.4" @@ -4577,7 +4421,6 @@ dependencies = [ "anyhow", "cc", "cfg-if", - "encoding_rs", "indexmap 2.2.6", "libc", "log", @@ -4588,11 +4431,9 @@ dependencies = [ "psm", "rustix", "sptr", - "wasm-encoder 0.41.2", + "wasm-encoder", "wasmtime-asm-macros", "wasmtime-environ", - "wasmtime-fiber", - "wasmtime-jit-debug", "wasmtime-versioned-export-macros", "wasmtime-wmemcheck", "windows-sys 0.52.0", @@ -4622,63 +4463,12 @@ dependencies = [ "syn 2.0.58", ] -[[package]] -name = "wasmtime-winch" -version = "18.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "729dff119cfd2e2333504b52db6661e49278314c83276a01d15a2a86e566e614" -dependencies = [ - "anyhow", - "cranelift-codegen", - "gimli", - "object", - "target-lexicon", - "wasmparser", - "wasmtime-cranelift-shared", - "wasmtime-environ", - "winch-codegen", -] - -[[package]] -name = "wasmtime-wit-bindgen" -version = "18.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6945fc6cfee04ba81016e9723bea77a2b913108e03904a4d901daedf208365f5" -dependencies = [ - "anyhow", - "heck 0.4.1", - "indexmap 2.2.6", - "wit-parser", -] - [[package]] name = "wasmtime-wmemcheck" version = "18.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1711f429111e782fac0537e0b3eb2ab6f821613cf1ec3013f2a0ff3fde41745" -[[package]] -name = "wast" -version = "211.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b25506dd82d00da6b14a87436b3d52b1d264083fa79cdb72a0d1b04a8595ccaa" -dependencies = [ - "bumpalo", - "leb128", - "memchr", - "unicode-width", - "wasm-encoder 0.211.1", -] - -[[package]] -name = "wat" -version = "1.211.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb716ca6c86eecac2d82541ffc39860118fc0af9309c4f2670637bea2e1bdd7d" -dependencies = [ - "wast", -] - [[package]] name = "web-sys" version = "0.3.69" @@ -4732,22 +4522,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "winch-codegen" -version = "0.16.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433cafb378ad01cd839974846204f56257ec34fc9d7db309ce1e34f24923fa6a" -dependencies = [ - "anyhow", - "cranelift-codegen", - "gimli", - "regalloc2", - "smallvec", - "target-lexicon", - "wasmparser", - "wasmtime-environ", -] - [[package]] name = "windows-core" version = "0.52.0" @@ -4898,23 +4672,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "wit-parser" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "316b36a9f0005f5aa4b03c39bc3728d045df136f8c13a73b7db4510dec725e08" -dependencies = [ - "anyhow", - "id-arena", - "indexmap 2.2.6", - "log", - "semver", - "serde", - "serde_derive", - "serde_json", - "unicode-xid", -] - [[package]] name = "wyz" version = "0.5.1" diff --git a/WORKSPACE b/WORKSPACE index 1de44c10f8..08ec410d91 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -297,6 +297,9 @@ load("@aspect_gcc_toolchain//toolchain:defs.bzl", "ARCHS", "gcc_register_toolcha gcc_register_toolchain( name = "gcc_toolchain_x86_64", + # Prevents aspect_gcc from rendering -nostdinc flag. Needed to compile wasmtime. + # See b/352306808#comment25. + extra_cflags = [], target_arch = ARCHS.x86_64, # target_compatible_with defaults to os:linux. ) diff --git a/bazel/crates/oak_crates_index.bzl b/bazel/crates/oak_crates_index.bzl index dfef7ef555..b15c56d98c 100644 --- a/bazel/crates/oak_crates_index.bzl +++ b/bazel/crates/oak_crates_index.bzl @@ -459,7 +459,19 @@ def oak_crates_index(cargo_lockfile, lockfile): # same version as cargo, newer versions had compatibility issues version = "0.31.2", ), - "wasmtime": crate.spec(version = "*"), + "wasmtime": crate.spec( + default_features = False, + # Try to figure out a minimal set of features we need (e.g. disable wasm profiling) + features = [ + "cranelift", + "cache", + "parallel-compilation", + "pooling-allocator", + "runtime", + ], + # same version as cargo + version = "18.0.4", + ), "which": crate.spec(version = "*"), "x509-cert": crate.spec( default_features = False, diff --git a/cargo-bazel-lock.json b/cargo-bazel-lock.json index 8cb2a29b23..6db41038e7 100644 --- a/cargo-bazel-lock.json +++ b/cargo-bazel-lock.json @@ -1,5 +1,5 @@ { - "checksum": "ef7b3cd97f535c525ead2703ef117550fa2804a322fdb81591801e0817f3a796", + "checksum": "3953a8111504d2020a4d628e0acf91dfe2714eaf10dcb4e8498ecc9cf1af1bcf", "crates": { "acpi 5.0.0": { "name": "acpi", @@ -3930,82 +3930,6 @@ ], "license_file": "LICENSE" }, - "cpp_demangle 0.3.5": { - "name": "cpp_demangle", - "version": "0.3.5", - "package_url": "https://github.com/gimli-rs/cpp_demangle", - "repository": { - "Http": { - "url": "https://static.crates.io/crates/cpp_demangle/0.3.5/download", - "sha256": "eeaa953eaad386a53111e47172c2fedba671e5684c8dd601a5f474f4f118710f" - } - }, - "targets": [ - { - "Library": { - "crate_name": "cpp_demangle", - "crate_root": "src/lib.rs", - "srcs": { - "allow_empty": false, - "include": [ - "**/*.rs" - ] - } - } - }, - { - "BuildScript": { - "crate_name": "build_script_build", - "crate_root": "build.rs", - "srcs": { - "allow_empty": false, - "include": [ - "**/*.rs" - ] - } - } - } - ], - "library_target_name": "cpp_demangle", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "crate_features": { - "common": [ - "default", - "std" - ], - "selects": {} - }, - "deps": { - "common": [ - { - "id": "cfg-if 1.0.0", - "target": "cfg_if" - }, - { - "id": "cpp_demangle 0.3.5", - "target": "build_script_build" - } - ], - "selects": {} - }, - "edition": "2015", - "version": "0.3.5" - }, - "build_script_attrs": { - "data_glob": [ - "**" - ] - }, - "license": "Apache-2.0/MIT", - "license_ids": [ - "Apache-2.0", - "MIT" - ], - "license_file": "LICENSE-APACHE" - }, "cpp_demangle 0.4.3": { "name": "cpp_demangle", "version": "0.4.3", @@ -7489,62 +7413,6 @@ ], "license_file": "LICENSE-APACHE" }, - "encoding_rs 0.8.34": { - "name": "encoding_rs", - "version": "0.8.34", - "package_url": "https://github.com/hsivonen/encoding_rs", - "repository": { - "Http": { - "url": "https://static.crates.io/crates/encoding_rs/0.8.34/download", - "sha256": "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" - } - }, - "targets": [ - { - "Library": { - "crate_name": "encoding_rs", - "crate_root": "src/lib.rs", - "srcs": { - "allow_empty": false, - "include": [ - "**/*.rs" - ] - } - } - } - ], - "library_target_name": "encoding_rs", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "crate_features": { - "common": [ - "alloc", - "default" - ], - "selects": {} - }, - "deps": { - "common": [ - { - "id": "cfg-if 1.0.0", - "target": "cfg_if" - } - ], - "selects": {} - }, - "edition": "2018", - "version": "0.8.34" - }, - "license": "(Apache-2.0 OR MIT) AND BSD-3-Clause", - "license_ids": [ - "Apache-2.0", - "BSD-3-Clause", - "MIT" - ], - "license_file": "LICENSE-APACHE" - }, "env_filter 0.1.0": { "name": "env_filter", "version": "0.1.0", @@ -8985,118 +8853,6 @@ ], "license_file": "LICENSE-APACHE" }, - "fxhash 0.2.1": { - "name": "fxhash", - "version": "0.2.1", - "package_url": "https://github.com/cbreeden/fxhash", - "repository": { - "Http": { - "url": "https://static.crates.io/crates/fxhash/0.2.1/download", - "sha256": "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" - } - }, - "targets": [ - { - "Library": { - "crate_name": "fxhash", - "crate_root": "lib.rs", - "srcs": { - "allow_empty": false, - "include": [ - "**/*.rs" - ] - } - } - } - ], - "library_target_name": "fxhash", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "deps": { - "common": [ - { - "id": "byteorder 1.5.0", - "target": "byteorder" - } - ], - "selects": {} - }, - "edition": "2015", - "version": "0.2.1" - }, - "license": "Apache-2.0/MIT", - "license_ids": [ - "Apache-2.0", - "MIT" - ], - "license_file": null - }, - "fxprof-processed-profile 0.6.0": { - "name": "fxprof-processed-profile", - "version": "0.6.0", - "package_url": "https://github.com/mstange/samply/", - "repository": { - "Http": { - "url": "https://static.crates.io/crates/fxprof-processed-profile/0.6.0/download", - "sha256": "27d12c0aed7f1e24276a241aadc4cb8ea9f83000f34bc062b7cc2d51e3b0fabd" - } - }, - "targets": [ - { - "Library": { - "crate_name": "fxprof_processed_profile", - "crate_root": "src/lib.rs", - "srcs": { - "allow_empty": false, - "include": [ - "**/*.rs" - ] - } - } - } - ], - "library_target_name": "fxprof_processed_profile", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "deps": { - "common": [ - { - "id": "bitflags 2.5.0", - "target": "bitflags" - }, - { - "id": "debugid 0.8.0", - "target": "debugid" - }, - { - "id": "fxhash 0.2.1", - "target": "fxhash" - }, - { - "id": "serde 1.0.197", - "target": "serde" - }, - { - "id": "serde_json 1.0.115", - "target": "serde_json" - } - ], - "selects": {} - }, - "edition": "2021", - "version": "0.6.0" - }, - "license": "MIT OR Apache-2.0", - "license_ids": [ - "Apache-2.0", - "MIT" - ], - "license_file": null - }, "generic-array 0.14.7": { "name": "generic-array", "version": "0.14.7", @@ -11086,52 +10842,6 @@ ], "license_file": "LICENSE-APACHE" }, - "id-arena 2.2.1": { - "name": "id-arena", - "version": "2.2.1", - "package_url": "https://github.com/fitzgen/id-arena", - "repository": { - "Http": { - "url": "https://static.crates.io/crates/id-arena/2.2.1/download", - "sha256": "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" - } - }, - "targets": [ - { - "Library": { - "crate_name": "id_arena", - "crate_root": "src/lib.rs", - "srcs": { - "allow_empty": false, - "include": [ - "**/*.rs" - ] - } - } - } - ], - "library_target_name": "id_arena", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "crate_features": { - "common": [ - "default", - "std" - ], - "selects": {} - }, - "edition": "2015", - "version": "2.2.1" - }, - "license": "MIT/Apache-2.0", - "license_ids": [ - "Apache-2.0", - "MIT" - ], - "license_file": "LICENSE-APACHE" - }, "ident_case 1.0.1": { "name": "ident_case", "version": "1.0.1", @@ -11795,140 +11505,10 @@ ], "license_file": "LICENSE-APACHE" }, - "ittapi 0.4.0": { - "name": "ittapi", - "version": "0.4.0", - "package_url": "https://github.com/intel/ittapi", - "repository": { - "Http": { - "url": "https://static.crates.io/crates/ittapi/0.4.0/download", - "sha256": "6b996fe614c41395cdaedf3cf408a9534851090959d90d54a535f675550b64b1" - } - }, - "targets": [ - { - "Library": { - "crate_name": "ittapi", - "crate_root": "src/lib.rs", - "srcs": { - "allow_empty": false, - "include": [ - "**/*.rs" - ] - } - } - } - ], - "library_target_name": "ittapi", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "deps": { - "common": [ - { - "id": "anyhow 1.0.81", - "target": "anyhow" - }, - { - "id": "ittapi-sys 0.4.0", - "target": "ittapi_sys" - }, - { - "id": "log 0.4.21", - "target": "log" - } - ], - "selects": {} - }, - "edition": "2021", - "version": "0.4.0" - }, - "license": "GPL-2.0-only OR BSD-3-Clause", - "license_ids": [ - "BSD-3-Clause", - "GPL-2.0" - ], - "license_file": null - }, - "ittapi-sys 0.4.0": { - "name": "ittapi-sys", - "version": "0.4.0", - "package_url": "https://github.com/intel/ittapi", - "repository": { - "Http": { - "url": "https://static.crates.io/crates/ittapi-sys/0.4.0/download", - "sha256": "52f5385394064fa2c886205dba02598013ce83d3e92d33dbdc0c52fe0e7bf4fc" - } - }, - "targets": [ - { - "Library": { - "crate_name": "ittapi_sys", - "crate_root": "src/lib.rs", - "srcs": { - "allow_empty": false, - "include": [ - "**/*.rs" - ] - } - } - }, - { - "BuildScript": { - "crate_name": "build_script_build", - "crate_root": "build.rs", - "srcs": { - "allow_empty": false, - "include": [ - "**/*.rs" - ] - } - } - } - ], - "library_target_name": "ittapi_sys", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "deps": { - "common": [ - { - "id": "ittapi-sys 0.4.0", - "target": "build_script_build" - } - ], - "selects": {} - }, - "edition": "2018", - "version": "0.4.0" - }, - "build_script_attrs": { - "data_glob": [ - "**" - ], - "deps": { - "common": [ - { - "id": "cc 1.0.97", - "target": "cc" - } - ], - "selects": {} - } - }, - "license": "GPL-2.0-only OR BSD-3-Clause", - "license_ids": [ - "BSD-3-Clause", - "GPL-2.0" - ], - "license_file": "LICENSES" - }, - "jobserver 0.1.31": { - "name": "jobserver", - "version": "0.1.31", - "package_url": "https://github.com/rust-lang/jobserver-rs", + "jobserver 0.1.31": { + "name": "jobserver", + "version": "0.1.31", + "package_url": "https://github.com/rust-lang/jobserver-rs", "repository": { "Http": { "url": "https://static.crates.io/crates/jobserver/0.1.31/download", @@ -19584,8 +19164,7 @@ ], "selects": { "x86_64-unknown-linux-gnu": [ - "mm", - "time" + "mm" ] } }, @@ -25302,51 +24881,6 @@ ], "license_file": "LICENSE-APACHE" }, - "unicode-xid 0.2.4": { - "name": "unicode-xid", - "version": "0.2.4", - "package_url": "https://github.com/unicode-rs/unicode-xid", - "repository": { - "Http": { - "url": "https://static.crates.io/crates/unicode-xid/0.2.4/download", - "sha256": "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - } - }, - "targets": [ - { - "Library": { - "crate_name": "unicode_xid", - "crate_root": "src/lib.rs", - "srcs": { - "allow_empty": false, - "include": [ - "**/*.rs" - ] - } - } - } - ], - "library_target_name": "unicode_xid", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "crate_features": { - "common": [ - "default" - ], - "selects": {} - }, - "edition": "2015", - "version": "0.2.4" - }, - "license": "MIT OR Apache-2.0", - "license_ids": [ - "Apache-2.0", - "MIT" - ], - "license_file": "LICENSE-APACHE" - }, "universal-hash 0.5.1": { "name": "universal-hash", "version": "0.5.1", @@ -26215,53 +25749,6 @@ ], "license_file": "LICENSE" }, - "wasm-encoder 0.211.1": { - "name": "wasm-encoder", - "version": "0.211.1", - "package_url": "https://github.com/bytecodealliance/wasm-tools/tree/main/crates/wasm-encoder", - "repository": { - "Http": { - "url": "https://static.crates.io/crates/wasm-encoder/0.211.1/download", - "sha256": "5e7d931a1120ef357f32b74547646b6fa68ea25e377772b72874b131a9ed70d4" - } - }, - "targets": [ - { - "Library": { - "crate_name": "wasm_encoder", - "crate_root": "src/lib.rs", - "srcs": { - "allow_empty": false, - "include": [ - "**/*.rs" - ] - } - } - } - ], - "library_target_name": "wasm_encoder", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "deps": { - "common": [ - { - "id": "leb128 0.2.5", - "target": "leb128" - } - ], - "selects": {} - }, - "edition": "2021", - "version": "0.211.1" - }, - "license": "Apache-2.0 WITH LLVM-exception", - "license_ids": [ - "Apache-2.0" - ], - "license_file": "LICENSE" - }, "wasmi 0.31.2": { "name": "wasmi", "version": "0.31.2", @@ -26558,57 +26045,6 @@ ], "license_file": "LICENSE" }, - "wasmprinter 0.2.80": { - "name": "wasmprinter", - "version": "0.2.80", - "package_url": "https://github.com/bytecodealliance/wasm-tools/tree/main/crates/wasmprinter", - "repository": { - "Http": { - "url": "https://static.crates.io/crates/wasmprinter/0.2.80/download", - "sha256": "60e73986a6b7fdfedb7c5bf9e7eb71135486507c8fbc4c0c42cffcb6532988b7" - } - }, - "targets": [ - { - "Library": { - "crate_name": "wasmprinter", - "crate_root": "src/lib.rs", - "srcs": { - "allow_empty": false, - "include": [ - "**/*.rs" - ] - } - } - } - ], - "library_target_name": "wasmprinter", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "deps": { - "common": [ - { - "id": "anyhow 1.0.81", - "target": "anyhow" - }, - { - "id": "wasmparser 0.121.2", - "target": "wasmparser" - } - ], - "selects": {} - }, - "edition": "2021", - "version": "0.2.80" - }, - "license": "Apache-2.0 WITH LLVM-exception", - "license_ids": [ - "Apache-2.0" - ], - "license_file": "LICENSE" - }, "wasmtime 18.0.4": { "name": "wasmtime", "version": "18.0.4", @@ -26640,29 +26076,16 @@ ], "crate_features": { "common": [ - "addr2line", - "async", "cache", - "component-model", - "coredump", "cranelift", - "debug-builtins", - "default", - "demangle", "parallel-compilation", "pooling-allocator", - "profiling", - "runtime", - "wat" + "runtime" ], "selects": {} }, "deps": { "common": [ - { - "id": "addr2line 0.21.0", - "target": "addr2line" - }, { "id": "anyhow 1.0.81", "target": "anyhow" @@ -26679,14 +26102,6 @@ "id": "cfg-if 1.0.0", "target": "cfg_if" }, - { - "id": "encoding_rs 0.8.34", - "target": "encoding_rs" - }, - { - "id": "fxprof-processed-profile 0.6.0", - "target": "fxprof_processed_profile" - }, { "id": "gimli 0.28.1", "target": "gimli" @@ -26695,10 +26110,6 @@ "id": "indexmap 2.2.6", "target": "indexmap" }, - { - "id": "ittapi 0.4.0", - "target": "ittapi" - }, { "id": "libc 0.2.153", "target": "libc" @@ -26731,10 +26142,6 @@ "id": "target-lexicon 0.12.14", "target": "target_lexicon" }, - { - "id": "wasm-encoder 0.41.2", - "target": "wasm_encoder" - }, { "id": "wasmparser 0.121.2", "target": "wasmparser" @@ -26743,10 +26150,6 @@ "id": "wasmtime-cache 18.0.4", "target": "wasmtime_cache" }, - { - "id": "wasmtime-component-util 18.0.4", - "target": "wasmtime_component_util" - }, { "id": "wasmtime-cranelift 18.0.4", "target": "wasmtime_cranelift" @@ -26755,14 +26158,6 @@ "id": "wasmtime-environ 18.0.4", "target": "wasmtime_environ" }, - { - "id": "wasmtime-fiber 18.0.4", - "target": "wasmtime_fiber" - }, - { - "id": "wasmtime-jit-debug 18.0.4", - "target": "wasmtime_jit_debug" - }, { "id": "wasmtime-jit-icache-coherence 18.0.4", "target": "wasmtime_jit_icache_coherence" @@ -26770,10 +26165,6 @@ { "id": "wasmtime-runtime 18.0.4", "target": "wasmtime_runtime" - }, - { - "id": "wat 1.211.1", - "target": "wat" } ], "selects": { @@ -26794,10 +26185,6 @@ "edition": "2021", "proc_macro_deps": { "common": [ - { - "id": "async-trait 0.1.79", - "target": "async_trait" - }, { "id": "paste 1.0.15", "target": "paste" @@ -26805,10 +26192,6 @@ { "id": "serde_derive 1.0.197", "target": "serde_derive" - }, - { - "id": "wasmtime-component-macro 18.0.4", - "target": "wasmtime_component_macro" } ], "selects": {} @@ -26990,142 +26373,6 @@ ], "license_file": "LICENSE" }, - "wasmtime-component-macro 18.0.4": { - "name": "wasmtime-component-macro", - "version": "18.0.4", - "package_url": "https://github.com/bytecodealliance/wasmtime", - "repository": { - "Http": { - "url": "https://static.crates.io/crates/wasmtime-component-macro/18.0.4/download", - "sha256": "dc6aca484581f9651886dca45f9dea893e105713b58623d14b06c56d8fe3f3f1" - } - }, - "targets": [ - { - "ProcMacro": { - "crate_name": "wasmtime_component_macro", - "crate_root": "src/lib.rs", - "srcs": { - "allow_empty": false, - "include": [ - "**/*.rs" - ] - } - } - }, - { - "BuildScript": { - "crate_name": "build_script_build", - "crate_root": "build.rs", - "srcs": { - "allow_empty": false, - "include": [ - "**/*.rs" - ] - } - } - } - ], - "library_target_name": "wasmtime_component_macro", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "crate_features": { - "common": [ - "async" - ], - "selects": {} - }, - "deps": { - "common": [ - { - "id": "anyhow 1.0.81", - "target": "anyhow" - }, - { - "id": "proc-macro2 1.0.79", - "target": "proc_macro2" - }, - { - "id": "quote 1.0.35", - "target": "quote" - }, - { - "id": "syn 2.0.58", - "target": "syn" - }, - { - "id": "wasmtime-component-macro 18.0.4", - "target": "build_script_build" - }, - { - "id": "wasmtime-component-util 18.0.4", - "target": "wasmtime_component_util" - }, - { - "id": "wasmtime-wit-bindgen 18.0.4", - "target": "wasmtime_wit_bindgen" - }, - { - "id": "wit-parser 0.13.2", - "target": "wit_parser" - } - ], - "selects": {} - }, - "edition": "2021", - "version": "18.0.4" - }, - "build_script_attrs": { - "data_glob": [ - "**" - ] - }, - "license": "Apache-2.0 WITH LLVM-exception", - "license_ids": [ - "Apache-2.0" - ], - "license_file": null - }, - "wasmtime-component-util 18.0.4": { - "name": "wasmtime-component-util", - "version": "18.0.4", - "package_url": "https://github.com/bytecodealliance/wasmtime", - "repository": { - "Http": { - "url": "https://static.crates.io/crates/wasmtime-component-util/18.0.4/download", - "sha256": "0aa907cc97ad039c43f98525d772f4841c2ce69a0c11eeec2a3a9c77fc730e87" - } - }, - "targets": [ - { - "Library": { - "crate_name": "wasmtime_component_util", - "crate_root": "src/lib.rs", - "srcs": { - "allow_empty": false, - "include": [ - "**/*.rs" - ] - } - } - } - ], - "library_target_name": "wasmtime_component_util", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "edition": "2021", - "version": "18.0.4" - }, - "license": "Apache-2.0 WITH LLVM-exception", - "license_ids": [ - "Apache-2.0" - ], - "license_file": null - }, "wasmtime-cranelift 18.0.4": { "name": "wasmtime-cranelift", "version": "18.0.4", @@ -27155,12 +26402,6 @@ "compile_data_glob": [ "**" ], - "crate_features": { - "common": [ - "component-model" - ], - "selects": {} - }, "deps": { "common": [ { @@ -27352,13 +26593,6 @@ "compile_data_glob": [ "**" ], - "crate_features": { - "common": [ - "component-model", - "demangle" - ], - "selects": {} - }, "deps": { "common": [ { @@ -27369,10 +26603,6 @@ "id": "bincode 1.3.3", "target": "bincode" }, - { - "id": "cpp_demangle 0.3.5", - "target": "cpp_demangle" - }, { "id": "cranelift-entity 0.105.4", "target": "cranelift_entity" @@ -27393,10 +26623,6 @@ "id": "object 0.32.2", "target": "object" }, - { - "id": "rustc-demangle 0.1.24", - "target": "rustc_demangle" - }, { "id": "serde 1.0.197", "target": "serde" @@ -27409,22 +26635,10 @@ "id": "thiserror 1.0.60", "target": "thiserror" }, - { - "id": "wasm-encoder 0.41.2", - "target": "wasm_encoder" - }, { "id": "wasmparser 0.121.2", "target": "wasmparser" }, - { - "id": "wasmprinter 0.2.80", - "target": "wasmprinter" - }, - { - "id": "wasmtime-component-util 18.0.4", - "target": "wasmtime_component_util" - }, { "id": "wasmtime-types 18.0.4", "target": "wasmtime_types" @@ -27450,20 +26664,20 @@ ], "license_file": "LICENSE" }, - "wasmtime-fiber 18.0.4": { - "name": "wasmtime-fiber", + "wasmtime-jit-icache-coherence 18.0.4": { + "name": "wasmtime-jit-icache-coherence", "version": "18.0.4", "package_url": "https://github.com/bytecodealliance/wasmtime", "repository": { "Http": { - "url": "https://static.crates.io/crates/wasmtime-fiber/18.0.4/download", - "sha256": "3174f71c8fbd9d2cb1233ad9f912f106bdd2a1a6d11a1b7707974ba3ad5f304a" + "url": "https://static.crates.io/crates/wasmtime-jit-icache-coherence/18.0.4/download", + "sha256": "dacd2aa30fb20fd8cd0eb4e664024a1ab28a02958529fa05bf52117532a098fc" } }, "targets": [ { "Library": { - "crate_name": "wasmtime_fiber", + "crate_name": "wasmtime_jit_icache_coherence", "crate_root": "src/lib.rs", "srcs": { "allow_empty": false, @@ -27472,52 +26686,28 @@ ] } } - }, - { - "BuildScript": { - "crate_name": "build_script_build", - "crate_root": "build.rs", - "srcs": { - "allow_empty": false, - "include": [ - "**/*.rs" - ] - } - } } ], - "library_target_name": "wasmtime_fiber", + "library_target_name": "wasmtime_jit_icache_coherence", "common_attrs": { "compile_data_glob": [ "**" ], "deps": { "common": [ - { - "id": "anyhow 1.0.81", - "target": "anyhow" - }, { "id": "cfg-if 1.0.0", "target": "cfg_if" - }, - { - "id": "wasmtime-fiber 18.0.4", - "target": "build_script_build" } ], "selects": { - "cfg(unix)": [ - { - "id": "rustix 0.38.32", - "target": "rustix" - }, + "cfg(any(target_os = \"linux\", target_os = \"macos\", target_os = \"freebsd\", target_os = \"android\"))": [ { - "id": "wasmtime-asm-macros 18.0.4", - "target": "wasmtime_asm_macros" + "id": "libc 0.2.153", + "target": "libc" } ], - "cfg(windows)": [ + "cfg(target_os = \"windows\")": [ { "id": "windows-sys 0.52.0", "target": "windows_sys" @@ -27526,60 +26716,28 @@ } }, "edition": "2021", - "proc_macro_deps": { - "common": [ - { - "id": "wasmtime-versioned-export-macros 18.0.4", - "target": "wasmtime_versioned_export_macros" - } - ], - "selects": {} - }, "version": "18.0.4" }, - "build_script_attrs": { - "data_glob": [ - "**" - ], - "deps": { - "common": [ - { - "id": "cc 1.0.97", - "target": "cc" - } - ], - "selects": {} - }, - "proc_macro_deps": { - "common": [ - { - "id": "wasmtime-versioned-export-macros 18.0.4", - "target": "wasmtime_versioned_export_macros" - } - ], - "selects": {} - } - }, "license": "Apache-2.0 WITH LLVM-exception", "license_ids": [ "Apache-2.0" ], - "license_file": "LICENSE" + "license_file": null }, - "wasmtime-jit-debug 18.0.4": { - "name": "wasmtime-jit-debug", + "wasmtime-runtime 18.0.4": { + "name": "wasmtime-runtime", "version": "18.0.4", "package_url": "https://github.com/bytecodealliance/wasmtime", "repository": { "Http": { - "url": "https://static.crates.io/crates/wasmtime-jit-debug/18.0.4/download", - "sha256": "4b0462a46b80d2352ee553b17d626b6468e9cec2220cc58ac31754fd7b58245e" + "url": "https://static.crates.io/crates/wasmtime-runtime/18.0.4/download", + "sha256": "d14e97c4bb36d91bcdd194745446d595e67ce8b89916806270fdbee640c747fd" } }, "targets": [ { "Library": { - "crate_name": "wasmtime_jit_debug", + "crate_name": "wasmtime_runtime", "crate_root": "src/lib.rs", "srcs": { "allow_empty": false, @@ -27588,186 +26746,40 @@ ] } } + }, + { + "BuildScript": { + "crate_name": "build_script_build", + "crate_root": "build.rs", + "srcs": { + "allow_empty": false, + "include": [ + "**/*.rs" + ] + } + } } ], - "library_target_name": "wasmtime_jit_debug", + "library_target_name": "wasmtime_runtime", "common_attrs": { "compile_data_glob": [ "**" ], "crate_features": { "common": [ - "gdb_jit_int", - "object", - "once_cell", - "perf_jitdump", - "rustix" + "pooling-allocator" ], "selects": {} }, "deps": { "common": [ { - "id": "object 0.32.2", - "target": "object" + "id": "anyhow 1.0.81", + "target": "anyhow" }, - { - "id": "once_cell 1.19.0", - "target": "once_cell" - } - ], - "selects": { - "x86_64-unknown-linux-gnu": [ - { - "id": "rustix 0.38.32", - "target": "rustix" - } - ] - } - }, - "edition": "2021", - "proc_macro_deps": { - "common": [ - { - "id": "wasmtime-versioned-export-macros 18.0.4", - "target": "wasmtime_versioned_export_macros" - } - ], - "selects": {} - }, - "version": "18.0.4" - }, - "license": "Apache-2.0 WITH LLVM-exception", - "license_ids": [ - "Apache-2.0" - ], - "license_file": null - }, - "wasmtime-jit-icache-coherence 18.0.4": { - "name": "wasmtime-jit-icache-coherence", - "version": "18.0.4", - "package_url": "https://github.com/bytecodealliance/wasmtime", - "repository": { - "Http": { - "url": "https://static.crates.io/crates/wasmtime-jit-icache-coherence/18.0.4/download", - "sha256": "dacd2aa30fb20fd8cd0eb4e664024a1ab28a02958529fa05bf52117532a098fc" - } - }, - "targets": [ - { - "Library": { - "crate_name": "wasmtime_jit_icache_coherence", - "crate_root": "src/lib.rs", - "srcs": { - "allow_empty": false, - "include": [ - "**/*.rs" - ] - } - } - } - ], - "library_target_name": "wasmtime_jit_icache_coherence", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "deps": { - "common": [ { "id": "cfg-if 1.0.0", "target": "cfg_if" - } - ], - "selects": { - "cfg(any(target_os = \"linux\", target_os = \"macos\", target_os = \"freebsd\", target_os = \"android\"))": [ - { - "id": "libc 0.2.153", - "target": "libc" - } - ], - "cfg(target_os = \"windows\")": [ - { - "id": "windows-sys 0.52.0", - "target": "windows_sys" - } - ] - } - }, - "edition": "2021", - "version": "18.0.4" - }, - "license": "Apache-2.0 WITH LLVM-exception", - "license_ids": [ - "Apache-2.0" - ], - "license_file": null - }, - "wasmtime-runtime 18.0.4": { - "name": "wasmtime-runtime", - "version": "18.0.4", - "package_url": "https://github.com/bytecodealliance/wasmtime", - "repository": { - "Http": { - "url": "https://static.crates.io/crates/wasmtime-runtime/18.0.4/download", - "sha256": "d14e97c4bb36d91bcdd194745446d595e67ce8b89916806270fdbee640c747fd" - } - }, - "targets": [ - { - "Library": { - "crate_name": "wasmtime_runtime", - "crate_root": "src/lib.rs", - "srcs": { - "allow_empty": false, - "include": [ - "**/*.rs" - ] - } - } - }, - { - "BuildScript": { - "crate_name": "build_script_build", - "crate_root": "build.rs", - "srcs": { - "allow_empty": false, - "include": [ - "**/*.rs" - ] - } - } - } - ], - "library_target_name": "wasmtime_runtime", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "crate_features": { - "common": [ - "async", - "component-model", - "debug-builtins", - "pooling-allocator", - "wasmtime-fiber", - "wasmtime-jit-debug" - ], - "selects": {} - }, - "deps": { - "common": [ - { - "id": "anyhow 1.0.81", - "target": "anyhow" - }, - { - "id": "cfg-if 1.0.0", - "target": "cfg_if" - }, - { - "id": "encoding_rs 0.8.34", - "target": "encoding_rs" }, { "id": "indexmap 2.2.6", @@ -27801,14 +26813,6 @@ "id": "wasmtime-environ 18.0.4", "target": "wasmtime_environ" }, - { - "id": "wasmtime-fiber 18.0.4", - "target": "wasmtime_fiber" - }, - { - "id": "wasmtime-jit-debug 18.0.4", - "target": "wasmtime_jit_debug" - }, { "id": "wasmtime-runtime 18.0.4", "target": "build_script_build" @@ -27902,275 +26906,14 @@ "package_url": "https://github.com/bytecodealliance/wasmtime", "repository": { "Http": { - "url": "https://static.crates.io/crates/wasmtime-types/18.0.4/download", - "sha256": "530b94c627a454d24f520173d3145112d1b807c44c82697a57e1d8e28390cde4" - } - }, - "targets": [ - { - "Library": { - "crate_name": "wasmtime_types", - "crate_root": "src/lib.rs", - "srcs": { - "allow_empty": false, - "include": [ - "**/*.rs" - ] - } - } - } - ], - "library_target_name": "wasmtime_types", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "deps": { - "common": [ - { - "id": "cranelift-entity 0.105.4", - "target": "cranelift_entity" - }, - { - "id": "serde 1.0.197", - "target": "serde" - }, - { - "id": "thiserror 1.0.60", - "target": "thiserror" - }, - { - "id": "wasmparser 0.121.2", - "target": "wasmparser" - } - ], - "selects": {} - }, - "edition": "2021", - "proc_macro_deps": { - "common": [ - { - "id": "serde_derive 1.0.197", - "target": "serde_derive" - } - ], - "selects": {} - }, - "version": "18.0.4" - }, - "license": "Apache-2.0 WITH LLVM-exception", - "license_ids": [ - "Apache-2.0" - ], - "license_file": "LICENSE" - }, - "wasmtime-versioned-export-macros 18.0.4": { - "name": "wasmtime-versioned-export-macros", - "version": "18.0.4", - "package_url": "https://github.com/bytecodealliance/wasmtime", - "repository": { - "Http": { - "url": "https://static.crates.io/crates/wasmtime-versioned-export-macros/18.0.4/download", - "sha256": "5399c175ddba4a471b9da45105dea3493059d52b2d54860eadb0df04c813948d" - } - }, - "targets": [ - { - "ProcMacro": { - "crate_name": "wasmtime_versioned_export_macros", - "crate_root": "src/lib.rs", - "srcs": { - "allow_empty": false, - "include": [ - "**/*.rs" - ] - } - } - } - ], - "library_target_name": "wasmtime_versioned_export_macros", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "deps": { - "common": [ - { - "id": "proc-macro2 1.0.79", - "target": "proc_macro2" - }, - { - "id": "quote 1.0.35", - "target": "quote" - }, - { - "id": "syn 2.0.58", - "target": "syn" - } - ], - "selects": {} - }, - "edition": "2021", - "version": "18.0.4" - }, - "license": "Apache-2.0 WITH LLVM-exception", - "license_ids": [ - "Apache-2.0" - ], - "license_file": null - }, - "wasmtime-winch 18.0.4": { - "name": "wasmtime-winch", - "version": "18.0.4", - "package_url": "https://github.com/bytecodealliance/wasmtime", - "repository": { - "Http": { - "url": "https://static.crates.io/crates/wasmtime-winch/18.0.4/download", - "sha256": "729dff119cfd2e2333504b52db6661e49278314c83276a01d15a2a86e566e614" - } - }, - "targets": [ - { - "Library": { - "crate_name": "wasmtime_winch", - "crate_root": "src/lib.rs", - "srcs": { - "allow_empty": false, - "include": [ - "**/*.rs" - ] - } - } - } - ], - "library_target_name": "wasmtime_winch", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "deps": { - "common": [ - { - "id": "anyhow 1.0.81", - "target": "anyhow" - }, - { - "id": "cranelift-codegen 0.105.4", - "target": "cranelift_codegen" - }, - { - "id": "gimli 0.28.1", - "target": "gimli" - }, - { - "id": "object 0.32.2", - "target": "object" - }, - { - "id": "target-lexicon 0.12.14", - "target": "target_lexicon" - }, - { - "id": "wasmparser 0.121.2", - "target": "wasmparser" - }, - { - "id": "wasmtime-cranelift-shared 18.0.4", - "target": "wasmtime_cranelift_shared" - }, - { - "id": "wasmtime-environ 18.0.4", - "target": "wasmtime_environ" - }, - { - "id": "winch-codegen 0.16.4", - "target": "winch_codegen" - } - ], - "selects": {} - }, - "edition": "2021", - "version": "18.0.4" - }, - "license": "Apache-2.0 WITH LLVM-exception", - "license_ids": [ - "Apache-2.0" - ], - "license_file": "LICENSE" - }, - "wasmtime-wit-bindgen 18.0.4": { - "name": "wasmtime-wit-bindgen", - "version": "18.0.4", - "package_url": "https://github.com/bytecodealliance/wasmtime", - "repository": { - "Http": { - "url": "https://static.crates.io/crates/wasmtime-wit-bindgen/18.0.4/download", - "sha256": "6945fc6cfee04ba81016e9723bea77a2b913108e03904a4d901daedf208365f5" - } - }, - "targets": [ - { - "Library": { - "crate_name": "wasmtime_wit_bindgen", - "crate_root": "src/lib.rs", - "srcs": { - "allow_empty": false, - "include": [ - "**/*.rs" - ] - } - } - } - ], - "library_target_name": "wasmtime_wit_bindgen", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "deps": { - "common": [ - { - "id": "anyhow 1.0.81", - "target": "anyhow" - }, - { - "id": "heck 0.4.1", - "target": "heck" - }, - { - "id": "indexmap 2.2.6", - "target": "indexmap" - }, - { - "id": "wit-parser 0.13.2", - "target": "wit_parser" - } - ], - "selects": {} - }, - "edition": "2021", - "version": "18.0.4" - }, - "license": "Apache-2.0 WITH LLVM-exception", - "license_ids": [ - "Apache-2.0" - ], - "license_file": null - }, - "wasmtime-wmemcheck 18.0.4": { - "name": "wasmtime-wmemcheck", - "version": "18.0.4", - "package_url": "https://github.com/bytecodealliance/wasmtime", - "repository": { - "Http": { - "url": "https://static.crates.io/crates/wasmtime-wmemcheck/18.0.4/download", - "sha256": "e1711f429111e782fac0537e0b3eb2ab6f821613cf1ec3013f2a0ff3fde41745" + "url": "https://static.crates.io/crates/wasmtime-types/18.0.4/download", + "sha256": "530b94c627a454d24f520173d3145112d1b807c44c82697a57e1d8e28390cde4" } }, "targets": [ { "Library": { - "crate_name": "wasmtime_wmemcheck", + "crate_name": "wasmtime_types", "crate_root": "src/lib.rs", "srcs": { "allow_empty": false, @@ -28181,34 +26924,64 @@ } } ], - "library_target_name": "wasmtime_wmemcheck", + "library_target_name": "wasmtime_types", "common_attrs": { "compile_data_glob": [ "**" ], + "deps": { + "common": [ + { + "id": "cranelift-entity 0.105.4", + "target": "cranelift_entity" + }, + { + "id": "serde 1.0.197", + "target": "serde" + }, + { + "id": "thiserror 1.0.60", + "target": "thiserror" + }, + { + "id": "wasmparser 0.121.2", + "target": "wasmparser" + } + ], + "selects": {} + }, "edition": "2021", + "proc_macro_deps": { + "common": [ + { + "id": "serde_derive 1.0.197", + "target": "serde_derive" + } + ], + "selects": {} + }, "version": "18.0.4" }, "license": "Apache-2.0 WITH LLVM-exception", "license_ids": [ "Apache-2.0" ], - "license_file": null + "license_file": "LICENSE" }, - "wast 211.0.1": { - "name": "wast", - "version": "211.0.1", - "package_url": "https://github.com/bytecodealliance/wasm-tools/tree/main/crates/wast", + "wasmtime-versioned-export-macros 18.0.4": { + "name": "wasmtime-versioned-export-macros", + "version": "18.0.4", + "package_url": "https://github.com/bytecodealliance/wasmtime", "repository": { "Http": { - "url": "https://static.crates.io/crates/wast/211.0.1/download", - "sha256": "b25506dd82d00da6b14a87436b3d52b1d264083fa79cdb72a0d1b04a8595ccaa" + "url": "https://static.crates.io/crates/wasmtime-versioned-export-macros/18.0.4/download", + "sha256": "5399c175ddba4a471b9da45105dea3493059d52b2d54860eadb0df04c813948d" } }, "targets": [ { - "Library": { - "crate_name": "wast", + "ProcMacro": { + "crate_name": "wasmtime_versioned_export_macros", "crate_root": "src/lib.rs", "srcs": { "allow_empty": false, @@ -28219,66 +26992,51 @@ } } ], - "library_target_name": "wast", + "library_target_name": "wasmtime_versioned_export_macros", "common_attrs": { "compile_data_glob": [ "**" ], - "crate_features": { - "common": [ - "default", - "wasm-module" - ], - "selects": {} - }, "deps": { "common": [ { - "id": "bumpalo 3.16.0", - "target": "bumpalo" - }, - { - "id": "leb128 0.2.5", - "target": "leb128" - }, - { - "id": "memchr 2.7.2", - "target": "memchr" + "id": "proc-macro2 1.0.79", + "target": "proc_macro2" }, { - "id": "unicode-width 0.1.13", - "target": "unicode_width" + "id": "quote 1.0.35", + "target": "quote" }, { - "id": "wasm-encoder 0.211.1", - "target": "wasm_encoder" + "id": "syn 2.0.58", + "target": "syn" } ], "selects": {} }, "edition": "2021", - "version": "211.0.1" + "version": "18.0.4" }, "license": "Apache-2.0 WITH LLVM-exception", "license_ids": [ "Apache-2.0" ], - "license_file": "LICENSE" + "license_file": null }, - "wat 1.211.1": { - "name": "wat", - "version": "1.211.1", - "package_url": "https://github.com/bytecodealliance/wasm-tools/tree/main/crates/wat", + "wasmtime-wmemcheck 18.0.4": { + "name": "wasmtime-wmemcheck", + "version": "18.0.4", + "package_url": "https://github.com/bytecodealliance/wasmtime", "repository": { "Http": { - "url": "https://static.crates.io/crates/wat/1.211.1/download", - "sha256": "eb716ca6c86eecac2d82541ffc39860118fc0af9309c4f2670637bea2e1bdd7d" + "url": "https://static.crates.io/crates/wasmtime-wmemcheck/18.0.4/download", + "sha256": "e1711f429111e782fac0537e0b3eb2ab6f821613cf1ec3013f2a0ff3fde41745" } }, "targets": [ { "Library": { - "crate_name": "wat", + "crate_name": "wasmtime_wmemcheck", "crate_root": "src/lib.rs", "srcs": { "allow_empty": false, @@ -28289,28 +27047,19 @@ } } ], - "library_target_name": "wat", + "library_target_name": "wasmtime_wmemcheck", "common_attrs": { "compile_data_glob": [ "**" ], - "deps": { - "common": [ - { - "id": "wast 211.0.1", - "target": "wast" - } - ], - "selects": {} - }, "edition": "2021", - "version": "1.211.1" + "version": "18.0.4" }, "license": "Apache-2.0 WITH LLVM-exception", "license_ids": [ "Apache-2.0" ], - "license_file": "LICENSE" + "license_file": null }, "web-sys 0.3.69": { "name": "web-sys", @@ -28686,102 +27435,6 @@ ], "license_file": null }, - "winch-codegen 0.16.4": { - "name": "winch-codegen", - "version": "0.16.4", - "package_url": "https://github.com/bytecodealliance/wasmtime", - "repository": { - "Http": { - "url": "https://static.crates.io/crates/winch-codegen/0.16.4/download", - "sha256": "433cafb378ad01cd839974846204f56257ec34fc9d7db309ce1e34f24923fa6a" - } - }, - "targets": [ - { - "Library": { - "crate_name": "winch_codegen", - "crate_root": "src/lib.rs", - "srcs": { - "allow_empty": false, - "include": [ - "**/*.rs" - ] - } - } - }, - { - "BuildScript": { - "crate_name": "build_script_build", - "crate_root": "build.rs", - "srcs": { - "allow_empty": false, - "include": [ - "**/*.rs" - ] - } - } - } - ], - "library_target_name": "winch_codegen", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "deps": { - "common": [ - { - "id": "anyhow 1.0.81", - "target": "anyhow" - }, - { - "id": "cranelift-codegen 0.105.4", - "target": "cranelift_codegen" - }, - { - "id": "gimli 0.28.1", - "target": "gimli" - }, - { - "id": "regalloc2 0.9.3", - "target": "regalloc2" - }, - { - "id": "smallvec 1.13.2", - "target": "smallvec" - }, - { - "id": "target-lexicon 0.12.14", - "target": "target_lexicon" - }, - { - "id": "wasmparser 0.121.2", - "target": "wasmparser" - }, - { - "id": "wasmtime-environ 18.0.4", - "target": "wasmtime_environ" - }, - { - "id": "winch-codegen 0.16.4", - "target": "build_script_build" - } - ], - "selects": {} - }, - "edition": "2021", - "version": "0.16.4" - }, - "build_script_attrs": { - "data_glob": [ - "**" - ] - }, - "license": "Apache-2.0 WITH LLVM-exception", - "license_ids": [ - "Apache-2.0" - ], - "license_file": "LICENSE" - }, "windows-core 0.52.0": { "name": "windows-core", "version": "0.52.0", @@ -30054,90 +28707,6 @@ ], "license_file": "LICENSE-MIT" }, - "wit-parser 0.13.2": { - "name": "wit-parser", - "version": "0.13.2", - "package_url": "https://github.com/bytecodealliance/wasm-tools/tree/main/crates/wit-parser", - "repository": { - "Http": { - "url": "https://static.crates.io/crates/wit-parser/0.13.2/download", - "sha256": "316b36a9f0005f5aa4b03c39bc3728d045df136f8c13a73b7db4510dec725e08" - } - }, - "targets": [ - { - "Library": { - "crate_name": "wit_parser", - "crate_root": "src/lib.rs", - "srcs": { - "allow_empty": false, - "include": [ - "**/*.rs" - ] - } - } - } - ], - "library_target_name": "wit_parser", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "deps": { - "common": [ - { - "id": "anyhow 1.0.81", - "target": "anyhow" - }, - { - "id": "id-arena 2.2.1", - "target": "id_arena" - }, - { - "id": "indexmap 2.2.6", - "target": "indexmap" - }, - { - "id": "log 0.4.21", - "target": "log" - }, - { - "id": "semver 1.0.22", - "target": "semver" - }, - { - "id": "serde 1.0.197", - "target": "serde" - }, - { - "id": "serde_json 1.0.115", - "target": "serde_json" - }, - { - "id": "unicode-xid 0.2.4", - "target": "unicode_xid" - } - ], - "selects": {} - }, - "edition": "2021", - "proc_macro_deps": { - "common": [ - { - "id": "serde_derive 1.0.197", - "target": "serde_derive" - } - ], - "selects": {} - }, - "version": "0.13.2" - }, - "license": "Apache-2.0 WITH LLVM-exception", - "license_ids": [ - "Apache-2.0" - ], - "license_file": null - }, "wyz 0.5.1": { "name": "wyz", "version": "0.5.1", diff --git a/oak_functions_service/BUILD b/oak_functions_service/BUILD index 5c77338ad2..8e337e4273 100644 --- a/oak_functions_service/BUILD +++ b/oak_functions_service/BUILD @@ -38,7 +38,7 @@ DEPS = [ UNRESTRICTED_DEPS = DEPS + [ "@oak_crates_index//:parking_lot", - #"@oak_crates_index//:wasmtime", + "@oak_crates_index//:wasmtime", ] rust_library( @@ -73,7 +73,7 @@ rust_library( crate_features = [ "deny_sensitive_logging", "std", - #"wasmtime", + "wasmtime", ], crate_name = "oak_functions_service", deps = UNRESTRICTED_DEPS, @@ -85,7 +85,7 @@ rust_library( crate_features = [ "allow_sensitive_logging", "std", - #"wasmtime", + "wasmtime", ], crate_name = "oak_functions_service", deps = UNRESTRICTED_DEPS, @@ -103,6 +103,18 @@ rust_test( ], ) +rust_test( + name = "lib_unrestricted_test", + crate = ":lib_unrestricted", + crate_features = ["bazel"], # TODO: b/333064338 remove. + data = ["//oak_functions/examples/echo"], + deps = [ + "//oak_functions_test_utils", + "@oak_crates_index//:bytes", + "@oak_crates_index//:prost", + ], +) + rust_test( name = "lib_insecure_test", crate = ":lib_insecure", @@ -114,3 +126,15 @@ rust_test( "@oak_crates_index//:prost", ], ) + +rust_test( + name = "lib_insecure_unrestricted_test", + crate = ":lib_insecure_unrestricted", + crate_features = ["bazel"], # TODO: b/333064338 remove. + data = ["//oak_functions/examples/echo"], + deps = [ + "//oak_functions_test_utils", + "@oak_crates_index//:bytes", + "@oak_crates_index//:prost", + ], +) diff --git a/oak_functions_service/src/wasm/wasmtime.rs b/oak_functions_service/src/wasm/wasmtime.rs index 32127030ef..e5abf42b2c 100644 --- a/oak_functions_service/src/wasm/wasmtime.rs +++ b/oak_functions_service/src/wasm/wasmtime.rs @@ -429,7 +429,7 @@ impl WasmtimeHandler { max_tables_per_component, total_memories, total_tables, - total_stacks, + // total_stacks, total_core_instances, max_core_instance_size as usize, max_tables_per_module,