From def92d1b8e9d373e2f6f27c366d578d97d8960c6 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 15 May 2024 05:34:50 +0200
Subject: Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 js/src/jit-test/tests/wasm/gc/casting.js | 69 ++++++++++++++++++++++++++++++++
 js/src/jit-test/tests/wasm/gc/i31ref.js  | 18 +++++++++
 2 files changed, 87 insertions(+)

(limited to 'js/src/jit-test/tests/wasm/gc')

diff --git a/js/src/jit-test/tests/wasm/gc/casting.js b/js/src/jit-test/tests/wasm/gc/casting.js
index a71a589db8..3b550e6415 100644
--- a/js/src/jit-test/tests/wasm/gc/casting.js
+++ b/js/src/jit-test/tests/wasm/gc/casting.js
@@ -114,3 +114,72 @@ function testAllCasts(types) {
   }
 }
 testAllCasts(TYPES);
+
+// Test that combinations of ref.test and ref.cast compile correctly.
+// (These can be optimized together.)
+{
+  const { make, test1, test2, test3, test4 } = wasmEvalText(`(module
+    (type $a (array i32))
+    (func (export "make") (param i32) (result anyref)
+      local.get 0
+      local.get 0
+      array.new_fixed $a 2
+    )
+    (func (export "test1") (param anyref) (result i32)
+      (if (ref.test (ref $a) (local.get 0))
+        (then
+          (ref.cast (ref $a) (local.get 0))
+          (array.get $a (i32.const 0))
+          return
+        )
+      )
+      i32.const -1
+    )
+    (func (export "test2") (param anyref) (result i32)
+      (if (ref.test (ref $a) (local.get 0))
+        (then)
+        (else
+          (ref.cast (ref $a) (local.get 0))
+          (array.get $a (i32.const 0))
+          return
+        )
+      )
+      i32.const -1
+    )
+    (func (export "test3") (param anyref) (result i32)
+      (if (ref.test (ref $a) (local.get 0))
+        (then
+          (if (ref.test (ref $a) (local.get 0))
+            (then)
+            (else
+              (ref.cast (ref $a) (local.get 0))
+              (array.get $a (i32.const 0))
+              return
+            )
+          )
+        )
+      )
+      i32.const -1
+    )
+    (func (export "test4") (param anyref) (result i32)
+      (if (ref.test (ref $a) (local.get 0))
+        (then
+          (if (ref.test (ref $a) (local.get 0))
+            (then
+              local.get 0
+              ref.cast (ref $a)
+              ref.cast (ref $a)
+              (array.get $a (i32.const 0))
+              return
+            )
+          )
+        )
+      )
+      i32.const -1
+    )
+  )`).exports;
+  assertEq(test1(make(99)), 99);
+  assertEq(test2(make(99)), -1);
+  assertEq(test3(make(99)), -1);
+  assertEq(test4(make(99)), 99);
+}
diff --git a/js/src/jit-test/tests/wasm/gc/i31ref.js b/js/src/jit-test/tests/wasm/gc/i31ref.js
index 65f2fccc3f..298447e848 100644
--- a/js/src/jit-test/tests/wasm/gc/i31ref.js
+++ b/js/src/jit-test/tests/wasm/gc/i31ref.js
@@ -149,6 +149,24 @@ for (const {input, expected} of bigI32Tests) {
   assertEq(getElem(), expected);
 }
 
+// Test that (ref.i31 (i32 const value)) optimization is correct
+for (let value of WasmI31refValues) {
+  let {compare} = wasmEvalText(`(module
+  (func $innerCompare (param i32) (param i31ref) (result i32)
+    (ref.eq
+      (ref.i31 local.get 0)
+      local.get 1
+    )
+  )
+  (func (export "compare") (result i32)
+    i32.const ${value}
+    (ref.i31 i32.const ${value})
+    call $innerCompare
+  )
+)`).exports;
+  assertEq(compare(value), 1);
+}
+
 const { i31GetU_null, i31GetS_null } = wasmEvalText(`(module
   (func (export "i31GetU_null") (result i32)
     ref.null i31
-- 
cgit v1.2.3