From 0285743622cc85a42543febfc2968bd165b535d8 Mon Sep 17 00:00:00 2001
From: Heejin Ahn <aheejin@gmail.com>
Date: Thu, 23 Feb 2023 19:51:12 -0800
Subject: [PATCH 1/2] [js-api] Add more tests reusing payload

As suggested in
https://github.com/WebAssembly/exception-handling/pull/256#discussion_r1109501365,
this adds two more tests:
- JS throws an exception, Wasm catches it and returns the payload.
- JS throws an exception, Wasm catches it and throws a new exception
  using that payload.
---
 .../exception/identity.tentative.any.js       | 45 ++++++++++++++++++-
 1 file changed, 43 insertions(+), 2 deletions(-)

diff --git a/test/js-api/exception/identity.tentative.any.js b/test/js-api/exception/identity.tentative.any.js
index 3854b014..dd92910c 100644
--- a/test/js-api/exception/identity.tentative.any.js
+++ b/test/js-api/exception/identity.tentative.any.js
@@ -47,11 +47,38 @@ test(() => {
     ])
     .exportFunc();
 
+  // Call a JS function that throws an exception, catches it with a 'catch'
+  // instruction, and returns its i32 payload.
+  builder
+    .addFunction("catch_js_tag_return_payload", kSig_i_v)
+    .addBody([
+      kExprTry, kWasmI32,
+        kExprCallFunction, throwJSTagExnIndex,
+        kExprI32Const, 0x00,
+      kExprCatch, jsTagIndex,
+        kExprReturn,
+      kExprEnd,
+    ])
+    .exportFunc();
+
+  // Call a JS function that throws an exception, catches it with a 'catch'
+  // instruction, and throws a new exception using that payload.
+  builder
+    .addFunction("catch_js_tag_throw_payload", kSig_v_v)
+    .addBody([
+      kExprTry, kWasmStmt,
+        kExprCallFunction, throwJSTagExnIndex,
+      kExprCatch, jsTagIndex,
+        kExprThrow, jsTagIndex,
+      kExprEnd,
+    ])
+    .exportFunc();
+
   const buffer = builder.toBuffer();
 
-  // The exception object's identity should be preserved across 'rethrow's in
-  // Wasm code. Do tests with a tag defined in JS.
   WebAssembly.instantiate(buffer, imports).then(result => {
+    // The exception object's identity should be preserved across 'rethrow's in
+    // Wasm code. Do tests with a tag defined in JS.
     try {
       result.instance.exports.catch_js_tag_rethrow();
     } catch (e) {
@@ -68,5 +95,19 @@ test(() => {
       assert_not_equals(e, jsTagExnSamePayload);
       assert_not_equals(e, jsTagExnDiffPayload);
     }
+
+    // This function catches the exception and returns its i32 payload, which
+    // should match the original payload.
+    assert_equals(result.instance.exports.catch_js_tag_return_payload(), 42);
+
+    // This function catches the exception and throws a new exception using the
+    // its payload. Even if the payload is reused, the exception objects should
+    // not compare equal.
+    try {
+      result.instance.exports.catch_js_tag_throw_payload();
+    } catch (e) {
+      assert_equals(e.getArg(jsTag, 0), 42);
+      assert_not_equals(e, jsTagExn);
+    }
   });
 }, "Identity check");

From b7ab374ecd5fb77a642fd79325b965ba8d606cd2 Mon Sep 17 00:00:00 2001
From: Heejin Ahn <aheejin@gmail.com>
Date: Mon, 27 Feb 2023 18:03:25 -0800
Subject: [PATCH 2/2] Fix

---
 test/js-api/exception/identity.tentative.any.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/js-api/exception/identity.tentative.any.js b/test/js-api/exception/identity.tentative.any.js
index c998850c..e431197d 100644
--- a/test/js-api/exception/identity.tentative.any.js
+++ b/test/js-api/exception/identity.tentative.any.js
@@ -94,7 +94,7 @@ test(() => {
         kExprI32Const, 0x00,
       kExprCatch, jsTagIndex,
         kExprReturn,
-      kExprEnd,
+      kExprEnd
     ])
     .exportFunc();
 
@@ -107,7 +107,9 @@ test(() => {
         kExprCallFunction, throwJSTagExnIndex,
       kExprCatch, jsTagIndex,
         kExprThrow, jsTagIndex,
-      kExprEnd,
+      kExprEnd
+    ])
+    .exportFunc();
 
   const buffer = builder.toBuffer();