Adding upstream version 115.7.0esr.upstream/115.7.0esr

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 80 insertions, 0 deletions

diff --git a/js/src/jit-test/tests/wasm/control-flow-phi-inputs.js b/js/src/jit-test/tests/wasm/control-flow-phi-inputs.js
new file mode 100644
index 0000000000..4e3fb23286
--- /dev/null
+++ b/js/src/jit-test/tests/wasm/control-flow-phi-inputs.js
@@ -0,0 +1,80 @@
+// Test the triangle pattern where the phi-input doesn't match the initial input.
+//
+//       initialBlock
+//         /     \
+// trueBranch     |
+//         \     /
+//    phiBlock+falseBranch
+//            |
+//        testBlock
+//
+// Also see bug 1768346.
+
+var f = wasmEvalText(`(module
+  (func (result i32)
+    block (result i32)
+      i32.const 0 ;; This must flow into the if below.
+      i32.const 1
+      br_if 0
+      drop
+      i32.const 1
+    end
+    if
+      i32.const 100
+      return
+    end
+    i32.const 200
+  )
+  (export "" (func 0))
+)`).exports[""];
+
+assertEq(f(), 200);
+
+var g = wasmEvalText(`(module
+  (func (result i32)
+    block (result i32)
+      i32.const 0 ;; This must flow into the if below.
+      i32.const 1
+      br_if 0
+      drop
+      i32.const 1 ;; This must flow into the if below
+      i32.const 1
+      br_if 0
+      drop
+      i32.const 1
+    end
+    if
+      i32.const 100
+      return
+    end
+    i32.const 200
+  )
+  (export "" (func 0))
+)`).exports[""];
+
+assertEq(g(), 200);
+
+var h = wasmEvalText(`(module
+  (func (param i32) (result i32)
+    block (result i32)
+      local.get 0 ;; This must flow into the if below.
+      local.get 0
+      br_if 0
+      drop
+      i32.const 0 ;; This must flow into the if below
+      i32.const 1
+      br_if 0
+      drop
+      i32.const 1
+    end
+    if
+      i32.const 100
+      return
+    end
+    i32.const 200
+  )
+  (export "" (func 0))
+)`).exports[""];
+
+assertEq(h(0), 200);
+assertEq(h(1), 100);