summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/passes/TranslateEH.cpp8
-rw-r--r--src/passes/pass.cpp7
-rw-r--r--src/passes/passes.h2
-rw-r--r--src/tools/wasm-opt.cpp23
-rw-r--r--test/lit/help/wasm-opt.test13
-rw-r--r--test/lit/help/wasm2js.test8
-rw-r--r--test/lit/passes/emit-exnref.wast28
-rw-r--r--test/lit/passes/experimental-new_eh.wast28
-rw-r--r--test/lit/passes/translate-to-exnref.wast (renamed from test/lit/passes/translate-to-new-eh.wast)4
9 files changed, 68 insertions, 53 deletions
diff --git a/src/passes/TranslateEH.cpp b/src/passes/TranslateEH.cpp
index 42cea6199..3d2f01510 100644
--- a/src/passes/TranslateEH.cpp
+++ b/src/passes/TranslateEH.cpp
@@ -15,7 +15,7 @@
*/
//
-// TranslateToNewEH translates the old Phase 3 EH instructions, which include
+// TranslateToExnref translates the old Phase 3 EH instructions, which include
// try, catch, catch_all, delegate, and rethrow, into the new EH instructions,
// which include try_table (with catch / catch_ref / catch_all / catch_all_ref)
// and throw_ref, passed at the Oct 2023 CG meeting. This translator can be used
@@ -39,7 +39,7 @@ namespace {
// Translates the old EH instructions (try / catch / catch_all / delegate /
// rethrow) into the new ones (try_table (+ catch / catch_ref / catch_all /
// catch_all_ref) / throw_ref).
-struct TranslateToNewEH : public WalkerPass<PostWalker<TranslateToNewEH>> {
+struct TranslateToExnref : public WalkerPass<PostWalker<TranslateToExnref>> {
bool isFunctionParallel() override { return true; }
// Scans and records which try labels are targeted by delegates and rethrows.
@@ -195,7 +195,7 @@ struct TranslateToNewEH : public WalkerPass<PostWalker<TranslateToNewEH>> {
std::unordered_map<Type, Index> typeToScratchLocal;
std::unique_ptr<Pass> create() override {
- return std::make_unique<TranslateToNewEH>();
+ return std::make_unique<TranslateToExnref>();
}
// Get a scratch local for a given type. These locals are used to contain
@@ -814,6 +814,6 @@ struct TranslateToNewEH : public WalkerPass<PostWalker<TranslateToNewEH>> {
} // namespace
-Pass* createTranslateToNewEHPass() { return new TranslateToNewEH(); }
+Pass* createTranslateToExnrefPass() { return new TranslateToExnref(); }
} // namespace wasm
diff --git a/src/passes/pass.cpp b/src/passes/pass.cpp
index c5a2bcc55..5e5ee04a4 100644
--- a/src/passes/pass.cpp
+++ b/src/passes/pass.cpp
@@ -501,8 +501,11 @@ void PassRegistry::registerPasses() {
"strip the wasm target features section",
createStripTargetFeaturesPass);
registerPass("translate-to-new-eh",
- "translate old EH instructions to new ones",
- createTranslateToNewEHPass);
+ "deprecated; same as translate-to-exnref",
+ createTranslateToExnrefPass);
+ registerPass("translate-to-exnref",
+ "translate old Phase 3 EH instructions to new ones with exnref",
+ createTranslateToExnrefPass);
registerPass("trap-mode-clamp",
"replace trapping operations with clamping semantics",
createTrapModeClamp);
diff --git a/src/passes/passes.h b/src/passes/passes.h
index ac3e1ef29..88e0a7ccc 100644
--- a/src/passes/passes.h
+++ b/src/passes/passes.h
@@ -166,7 +166,7 @@ Pass* createStripEHPass();
Pass* createStubUnsupportedJSOpsPass();
Pass* createSSAifyPass();
Pass* createSSAifyNoMergePass();
-Pass* createTranslateToNewEHPass();
+Pass* createTranslateToExnrefPass();
Pass* createTrapModeClamp();
Pass* createTrapModeJS();
Pass* createTupleOptimizationPass();
diff --git a/src/tools/wasm-opt.cpp b/src/tools/wasm-opt.cpp
index cb6d0bcec..73908afb7 100644
--- a/src/tools/wasm-opt.cpp
+++ b/src/tools/wasm-opt.cpp
@@ -91,7 +91,7 @@ int main(int argc, const char* argv[]) {
std::string inputSourceMapFilename;
std::string outputSourceMapFilename;
std::string outputSourceMapUrl;
- bool experimentalNewEH = false;
+ bool emitExnref = false;
const std::string WasmOptOption = "wasm-opt options";
@@ -241,15 +241,19 @@ int main(int argc, const char* argv[]) {
})
.add("--experimental-new-eh",
"",
+ "Deprecated; same as --emit-exnref",
+ WasmOptOption,
+ Options::Arguments::Zero,
+ [&emitExnref](Options*, const std::string&) { emitExnref = true; })
+ .add("--emit-exnref",
+ "",
"After running all requested transformations / optimizations, "
"translate the instruction to use the new EH instructions at the end. "
"Depending on the optimization level specified, this may do some more "
"post-translation optimizations.",
WasmOptOption,
Options::Arguments::Zero,
- [&experimentalNewEH](Options*, const std::string&) {
- experimentalNewEH = true;
- });
+ [&emitExnref](Options*, const std::string&) { emitExnref = true; });
options.parse(argc, argv);
Module wasm;
@@ -356,11 +360,10 @@ int main(int argc, const char* argv[]) {
std::cout << "[extra-fuzz-command first output:]\n" << firstOutput << '\n';
}
- bool translateToNewEH =
- wasm.features.hasExceptionHandling() && experimentalNewEH;
+ bool translateToExnref = wasm.features.hasExceptionHandling() && emitExnref;
if (!options.runningPasses()) {
- if (!options.quiet && !translateToNewEH) {
+ if (!options.quiet && !translateToExnref) {
std::cerr << "warning: no passes specified, not doing any work\n";
}
} else {
@@ -397,12 +400,10 @@ int main(int argc, const char* argv[]) {
}
}
- if (translateToNewEH) {
+ if (translateToExnref) {
BYN_TRACE("translating to new EH instructions...\n");
PassRunner runner(&wasm, options.passOptions);
- runner.add("translate-to-new-eh");
- // Perform Stack IR optimizations here, at the very end of the
- // optimization pipeline.
+ runner.add("translate-to-exnref");
runner.run();
if (options.passOptions.validate) {
bool valid = WasmValidator().validate(wasm, options.passOptions);
diff --git a/test/lit/help/wasm-opt.test b/test/lit/help/wasm-opt.test
index f6497618e..6dafe2c62 100644
--- a/test/lit/help/wasm-opt.test
+++ b/test/lit/help/wasm-opt.test
@@ -79,7 +79,10 @@
;; CHECK-NEXT: --new-wat-parser Use the experimental new WAT
;; CHECK-NEXT: parser
;; CHECK-NEXT:
-;; CHECK-NEXT: --experimental-new-eh After running all requested
+;; CHECK-NEXT: --experimental-new-eh Deprecated; same as
+;; CHECK-NEXT: --emit-exnref
+;; CHECK-NEXT:
+;; CHECK-NEXT: --emit-exnref After running all requested
;; CHECK-NEXT: transformations / optimizations,
;; CHECK-NEXT: translate the instruction to use
;; CHECK-NEXT: the new EH instructions at the
@@ -502,8 +505,12 @@
;; CHECK-NEXT:
;; CHECK-NEXT: --symbolmap (alias for print-function-map)
;; CHECK-NEXT:
-;; CHECK-NEXT: --translate-to-new-eh translate old EH instructions to
-;; CHECK-NEXT: new ones
+;; CHECK-NEXT: --translate-to-exnref translate old Phase 3 EH
+;; CHECK-NEXT: instructions to new ones with
+;; CHECK-NEXT: exnref
+;; CHECK-NEXT:
+;; CHECK-NEXT: --translate-to-new-eh deprecated; same as
+;; CHECK-NEXT: translate-to-exnref
;; CHECK-NEXT:
;; CHECK-NEXT: --trap-mode-clamp replace trapping operations with
;; CHECK-NEXT: clamping semantics
diff --git a/test/lit/help/wasm2js.test b/test/lit/help/wasm2js.test
index 13e93c33b..63d43d388 100644
--- a/test/lit/help/wasm2js.test
+++ b/test/lit/help/wasm2js.test
@@ -452,8 +452,12 @@
;; CHECK-NEXT:
;; CHECK-NEXT: --symbolmap (alias for print-function-map)
;; CHECK-NEXT:
-;; CHECK-NEXT: --translate-to-new-eh translate old EH instructions to
-;; CHECK-NEXT: new ones
+;; CHECK-NEXT: --translate-to-exnref translate old Phase 3 EH
+;; CHECK-NEXT: instructions to new ones with
+;; CHECK-NEXT: exnref
+;; CHECK-NEXT:
+;; CHECK-NEXT: --translate-to-new-eh deprecated; same as
+;; CHECK-NEXT: translate-to-exnref
;; CHECK-NEXT:
;; CHECK-NEXT: --trap-mode-clamp replace trapping operations with
;; CHECK-NEXT: clamping semantics
diff --git a/test/lit/passes/emit-exnref.wast b/test/lit/passes/emit-exnref.wast
new file mode 100644
index 000000000..d203c2f10
--- /dev/null
+++ b/test/lit/passes/emit-exnref.wast
@@ -0,0 +1,28 @@
+;; When given alone, --emit-exnref just runs --translate-to-exnref
+;; RUN: wasm-opt %s -all --translate-to-exnref -S -o %t1.wasm
+;; RUN: wasm-opt %s -all --emit-exnref -S -o %t2.wasm
+;; RUN: diff %t1.wasm %t2.wasm
+
+;; When given with other flags, --emit-exnref runs the translator after running
+;; other passes. If --optimize-level >=3, --experimenal-new-eh also runs StackIR
+;; (+ local2stack) optimization. So running '-O --emit-exnref' should be the
+;; same as running all these passes separately.
+;; RUN: wasm-opt %s -all -O --translate-to-exnref --optimize-level=3 --generate-stack-ir --optimize-stack-ir -o %t1.wasm
+;; RUN: wasm-opt %s -all -O --emit-exnref -o %t2.wasm
+;; RUN: diff %t1.wasm %t2.wasm
+
+(module
+ (import "env" "foo" (func $foo))
+ (start $test)
+ (func $test
+ (try $l
+ (do
+ (call $foo)
+ )
+ (catch_all
+ (call $foo)
+ (rethrow $l)
+ )
+ )
+ )
+)
diff --git a/test/lit/passes/experimental-new_eh.wast b/test/lit/passes/experimental-new_eh.wast
deleted file mode 100644
index 9ef847e58..000000000
--- a/test/lit/passes/experimental-new_eh.wast
+++ /dev/null
@@ -1,28 +0,0 @@
-;; When given alone, --experimental-new-eh just runs --translate-to-new-eh
-;; RUN: wasm-opt %s -all --translate-to-new-eh -S -o %t1.wasm
-;; RUN: wasm-opt %s -all --experimental-new-eh -S -o %t2.wasm
-;; RUN: diff %t1.wasm %t2.wasm
-
-;; When given with other flags, --experimental-new-eh runs the translator after
-;; running other passes. If --optimize-level >=3, --experimenal-new-eh also runs
-;; StackIR (+ local2stack) optimization. So running '-O --experimental-new-eh'
-;; should be the same as running all these passes separately.
-;; RUN: wasm-opt %s -all -O --translate-to-new-eh --optimize-level=3 --generate-stack-ir --optimize-stack-ir -o %t1.wasm
-;; RUN: wasm-opt %s -all -O --experimental-new-eh -o %t2.wasm
-;; RUN: diff %t1.wasm %t2.wasm
-
-(module
- (import "env" "foo" (func $foo))
- (start $test)
- (func $test
- (try $l
- (do
- (call $foo)
- )
- (catch_all
- (call $foo)
- (rethrow $l)
- )
- )
- )
-)
diff --git a/test/lit/passes/translate-to-new-eh.wast b/test/lit/passes/translate-to-exnref.wast
index 10de158d4..abba6b06e 100644
--- a/test/lit/passes/translate-to-new-eh.wast
+++ b/test/lit/passes/translate-to-exnref.wast
@@ -1,6 +1,6 @@
;; NOTE: Assertions have been generated by update_lit_checks.py --all-items and should not be edited.
-;; RUN: wasm-opt %s -all --translate-to-new-eh -S -o - | filecheck %s
-;; RUN: wasm-opt %s -all --translate-to-new-eh -S -o %t
+;; RUN: wasm-opt %s -all --translate-to-exnref -S -o - | filecheck %s
+;; RUN: wasm-opt %s -all --translate-to-exnref -S -o %t
;; RUN: wasm-opt %t -all --optimize-level=3 --generate-stack-ir --optimize-stack-ir --print-stack-ir | filecheck %s --check-prefix STACKIR-OPT
(module
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-05 15:59:29 +0000