run less passes and fix warning

MercuryWorkshop · Mar 8, 2025 · 3da0e1d · 3da0e1d
1 parent 788ea60
commit 3da0e1d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/rewriter/wasm/build.sh b/rewriter/wasm/build.sh
@@ -89,13 +89,13 @@ if [ "${RELEASE:-0}" = "1" ]; then
 		G="--generate-global-effects"
 		# shellcheck disable=SC2086
 		time wasm-opt $WASMOPTFLAGS \
-			rewriter/wasm/out/wasm_snipped.wasm -o rewriter/wasm/out/optimized.wasm \
-			--converge -tnh --enable-threads --enable-bulk-memory --enable-simd \
-			$G --type-unfinalizing $G --type-ssa $G -O4 $G --flatten $G --rereloop $G -O4 $G -O4 $G --type-merging $G --type-finalizing $G -O4 \
-			$G --type-unfinalizing $G --type-ssa $G -Oz $G --flatten $G --rereloop $G -Oz $G -Oz $G --type-merging $G --type-finalizing $G -Oz \
-			$G --abstract-type-refining $G --code-folding $G --const-hoisting $G --dae $G --flatten $G --dfo $G --merge-locals $G --merge-similar-functions --type-finalizing \
-			$G --type-unfinalizing $G --type-ssa $G -O4 $G --flatten $G --rereloop $G -O4 $G -O4 $G --type-merging $G --type-finalizing $G -O4 \
-			$G --type-unfinalizing $G --type-ssa $G -Oz $G --flatten $G --rereloop $G -Oz $G -Oz $G --type-merging $G --type-finalizing $G -Oz 
+			rewriter/wasm/out/wasm_snipped.wasm -o rewriter/wasm/out/optimized.wasm --enable-threads --enable-bulk-memory --enable-simd \
+			--converge -tnh --vacuum \
+			$G -O4 $G --flatten $G --rereloop $G -O4 $G -O4 $G -O4 \
+			$G -Oz $G --flatten $G --rereloop $G -Oz $G -Oz $G -Oz \
+			$G --code-folding $G --const-hoisting $G --dae $G --flatten $G --merge-locals \
+			$G -O4 $G --flatten $G --rereloop $G -O4 $G -O4 $G -O4 \
+			$G -Oz $G --flatten $G --rereloop $G -Oz $G -Oz $G -Oz
 	)
 else
 	cp rewriter/wasm/out/wasm_snipped.wasm rewriter/wasm/out/optimized.wasm

diff --git a/rewriter/wasm/src/lib.rs b/rewriter/wasm/src/lib.rs
@@ -1,10 +1,6 @@
 pub mod error;
 
-use std::{
-	cell::{OnceCell, RefCell},
-	sync::{Arc, OnceLock},
-	time::Duration,
-};
+use std::{cell::RefCell, sync::Arc, time::Duration};
 
 use error::{Result, RewriterError};
 use instant::Instant;