Switch to wasm-opt-rs crate (#604)

crates/cli/Cargo.toml

@@ -18,7 +18,6 @@ experimental_event_loop = []
 wizer = { workspace = true }
 structopt = "0.3"
 anyhow = { workspace = true }
-binaryen = { git = "https://github.com/pepyakin/binaryen-rs", rev = "00c98174843f957681ba0bc5cdcc9d15f5d0cb23" }
 brotli = "3.4.0"
 wasmprinter = { version = "0.2.78", optional = true }
 wasmtime = { workspace = true }
@@ -28,6 +27,8 @@ walrus = "0.20.3"
 swc_core = { version = "0.89.7", features = ["common_sourcemap", "ecma_ast", "ecma_parser"] }
 wit-parser = "0.13.1"
 convert_case = "0.6.0"
+wasm-opt = "0.116.0"
+tempfile = "3.9.0"
 
 [dev-dependencies]
 serde_json = "1.0"
@@ -36,7 +37,6 @@ lazy_static = "1.4"
 serde = { version = "1.0", default-features = false, features = ["derive"] }
 criterion = "0.5"
 num-format = "0.4.4"
-tempfile = "3.9.0"
 wasmparser = "0.121.0"
 
 [build-dependencies]

crates/cli/src/wasm_generator/static.rs

@@ -1,9 +1,9 @@
-use std::{collections::HashMap, rc::Rc, sync::OnceLock};
+use std::{collections::HashMap, fs, rc::Rc, sync::OnceLock};
 
 use anyhow::{anyhow, Result};
-use binaryen::{CodegenConfig, Module};
 use walrus::{DataKind, ExportItem, FunctionBuilder, FunctionId, MemoryId, ValType};
 use wasi_common::{pipe::ReadPipe, WasiCtx};
+use wasm_opt::{OptimizationOptions, ShrinkLevel};
 use wasmtime::Linker;
 use wasmtime_wasi::WasiCtxBuilder;
 use wizer::Wizer;
@@ -82,19 +82,7 @@ pub fn generate(js: &JS, exports: Vec<Export>, no_source_compression: bool) -> R
 
     let wasm = module.emit_wasm();
 
-    let codegen_cfg = CodegenConfig {
-        optimization_level: 3, // Aggressively optimize for speed.
-        shrink_level: 0,       // Don't optimize for size at the expense of performance.
-        debug_info: false,
-    };
-
-    let mut module = Module::read(&wasm)
-        .map_err(|_| anyhow!("Unable to read wasm binary for wasm-opt optimizations"))?;
-    module.optimize(&codegen_cfg);
-    module
-        .run_optimization_passes(vec!["strip"], &codegen_cfg)
-        .map_err(|_| anyhow!("Running wasm-opt optimization passes failed"))?;
-    let wasm = module.write();
+    let wasm = optimize_wasm(&wasm)?;
 
     let mut module = transform::module_config().parse(&wasm)?;
     if no_source_compression {
@@ -140,3 +128,17 @@ fn export_exported_js_functions(
         module.exports.add(&export.wit, export_fn);
     }
 }
+
+fn optimize_wasm(wasm: &[u8]) -> Result<Vec<u8>> {
+    let tempdir = tempfile::tempdir()?;
+    let tempfile_path = tempdir.path().join("temp.wasm");
+
+    fs::write(&tempfile_path, wasm)?;
+
+    OptimizationOptions::new_opt_level_3() // Aggressively optimize for speed.
+        .shrink_level(ShrinkLevel::Level0) // Don't optimize for size at the expense of performance.
+        .debug_info(false)
+        .run(&tempfile_path, &tempfile_path)?;
+
+    Ok(fs::read(&tempfile_path)?)
+}

supply-chain/audits.toml

@@ -123,6 +123,30 @@ user-id = 189 # Andrew Gallant (BurntSushi)
 start = "2019-06-26"
 end = "2024-10-03"
 
+[[trusted.cxx]]
+criteria = "safe-to-deploy"
+user-id = 3618 # David Tolnay (dtolnay)
+start = "2019-12-28"
+end = "2025-02-05"
+
+[[trusted.cxx-build]]
+criteria = "safe-to-deploy"
+user-id = 3618 # David Tolnay (dtolnay)
+start = "2020-04-30"
+end = "2025-02-05"
+
+[[trusted.cxxbridge-flags]]
+criteria = "safe-to-deploy"
+user-id = 3618 # David Tolnay (dtolnay)
+start = "2020-08-30"
+end = "2025-02-05"
+
+[[trusted.cxxbridge-macro]]
+criteria = "safe-to-deploy"
+user-id = 3618 # David Tolnay (dtolnay)
+start = "2020-01-08"
+end = "2025-02-05"
+
 [[trusted.env_logger]]
 criteria = "safe-to-deploy"
 user-id = 6743 # Ed Page (epage)
@@ -351,6 +375,12 @@ user-id = 2915 # Amanieu d'Antras (Amanieu)
 start = "2020-02-16"
 end = "2024-07-12"
 
+[[trusted.scratch]]
+criteria = "safe-to-deploy"
+user-id = 3618 # David Tolnay (dtolnay)
+start = "2020-09-17"
+end = "2025-02-05"
+
 [[trusted.serde]]
 criteria = "safe-to-deploy"
 user-id = 3618 # David Tolnay (dtolnay)