diff --git a/.git-third-party/.gitattributes b/.git-third-party/.gitattributes new file mode 100644 index 00000000..afbc4add --- /dev/null +++ b/.git-third-party/.gitattributes @@ -0,0 +1,6 @@ +# Managed by git-third-party. + +# Patch names are a digest of the patch bytes: normalizing them changes what +# gets applied, and breaks the name. +patches/** -text +manifest.json text eol=lf diff --git a/.git-third-party/.gitignore b/.git-third-party/.gitignore new file mode 100644 index 00000000..9b33cbe9 --- /dev/null +++ b/.git-third-party/.gitignore @@ -0,0 +1,5 @@ +# Managed by git-third-party. + +# Scratch left behind by an interrupted write. +*.tmp +patches/**/*.tmp diff --git a/.git-third-party/config.json b/.git-third-party/manifest.json similarity index 76% rename from .git-third-party/config.json rename to .git-third-party/manifest.json index c3e65a7e..15675638 100644 --- a/.git-third-party/config.json +++ b/.git-third-party/manifest.json @@ -3,13 +3,18 @@ "executor/third-party/wasmtime": { "url": "https://github.com/bytecodealliance/wasmtime.git", "commit": "6844a83b530f86ad13a65175282fe2dbcd33cad1", - "patches": 2, + "patches": [ + "41ma00mnkw1fck5s", + "1rntcejzarfn1yww" + ], "submodules": [] }, "executor/third-party/wasm-tools": { "url": "https://github.com/bytecodealliance/wasm-tools.git", "commit": "76927bf4bdbddf4b15f835c5eddfffbdfe3bdbd5", - "patches": 1 + "patches": [ + "gk2m1xpfybm4kec2" + ] } } } diff --git a/.git-third-party/patches/executor/third-party/wasm-tools/1 b/.git-third-party/patches/executor/third-party/wasm-tools/gk2m1xpfybm4kec2 similarity index 100% rename from .git-third-party/patches/executor/third-party/wasm-tools/1 rename to .git-third-party/patches/executor/third-party/wasm-tools/gk2m1xpfybm4kec2 diff --git a/.git-third-party/patches/executor/third-party/wasmtime/2 b/.git-third-party/patches/executor/third-party/wasmtime/1rntcejzarfn1yww similarity index 100% rename from .git-third-party/patches/executor/third-party/wasmtime/2 rename to .git-third-party/patches/executor/third-party/wasmtime/1rntcejzarfn1yww diff --git a/.git-third-party/patches/executor/third-party/wasmtime/1 b/.git-third-party/patches/executor/third-party/wasmtime/41ma00mnkw1fck5s similarity index 100% rename from .git-third-party/patches/executor/third-party/wasmtime/1 rename to .git-third-party/patches/executor/third-party/wasmtime/41ma00mnkw1fck5s diff --git a/executor/src/rt/errors.rs b/executor/src/rt/errors.rs index db56361a..5d162201 100644 --- a/executor/src/rt/errors.rs +++ b/executor/src/rt/errors.rs @@ -107,7 +107,7 @@ impl UnwrapDynError { /// independent of the wasm store and can be done even after it is consumed. pub fn extract_backtrace(err: &UnwrapDynError) -> Option { let Some(bt) = err.downcast_ref::() else { - log_warn!("no backtrace attached"); + log_debug!("no backtrace attached"); return None; }; diff --git a/executor/src/rt/supervisor/mod.rs b/executor/src/rt/supervisor/mod.rs index 6e9f34a1..99e88c5f 100644 --- a/executor/src/rt/supervisor/mod.rs +++ b/executor/src/rt/supervisor/mod.rs @@ -111,7 +111,6 @@ pub fn create_engines( .wasm_features(WasmFeatures::SIGN_EXTENSION, true) .wasm_features(WasmFeatures::MUTABLE_GLOBAL, true) .wasm_features(WasmFeatures::MULTI_VALUE, true) - .wasm_features(WasmFeatures::SATURATING_FLOAT_TO_INT, false) //.wasm_features(WasmFeatures::REFERENCE_TYPES, false) .wasm_features(WasmFeatures::SATURATING_FLOAT_TO_INT, true);