4 files changed, 104 insertions, 0 deletions
diff --git a/js/src/jit-test/tests/basic/bug1644839-2.js b/js/src/jit-test/tests/basic/bug1644839-2.js
new file mode 100644
index 000000000..62550670e
--- /dev/null
+++ b/js/src/jit-test/tests/basic/bug1644839-2.js
@@ -0,0 +1,5 @@
+// |jit-test| skip-if: !('oomTest' in this)
+var code = `
+  (\`\${key}: \${(args[1]?.toString)?.()}\`)
+`;
+oomTest(function() { return parseModule(code); });
+\ No newline at end of file
diff --git a/js/src/jit-test/tests/basic/bug1644839.js b/js/src/jit-test/tests/basic/bug1644839.js
new file mode 100644
index 000000000..1a9ec3dd8
--- /dev/null
+++ b/js/src/jit-test/tests/basic/bug1644839.js
@@ -0,0 +1,5 @@
+// |jit-test| skip-if: !('oomTest' in this)
+var code = `
+  (\`\${key}: \${args[1]?.toString()}\`)
+`;
+oomTest(function() { return parseModule(code); });
+\ No newline at end of file
diff --git a/js/src/jit-test/tests/optional-chain/call-ignore-rval.js b/js/src/jit-test/tests/optional-chain/call-ignore-rval.js
new file mode 100644
index 000000000..c5fd2fe97
--- /dev/null
+++ b/js/src/jit-test/tests/optional-chain/call-ignore-rval.js
@@ -0,0 +1,34 @@
+// Tests for JSOp::CallIgnoresRv in optional chains.
+
+// Note:: IgnoresReturnValueNative is supported for Array.prototype.splice.
+
+// Test for optional call.
+function testOptionalCall() {
+  for (var i = 0; i < 100; ++i) {
+    var x = [1, 2, 3];
+    x.splice?.(0);
+  }
+}
+
+for (var i = 0; i < 5; ++i) { testOptionalCall(); }
+
+// Test for optional prop directly followed by call.
+function testOptionalProp() {
+  for (var i = 0; i < 100; ++i) {
+    var x = [1, 2, 3];
+    x?.splice(0);
+  }
+}
+
+for (var i = 0; i < 5; ++i) { testOptionalProp(); }
+
+// Test for call in optional chain expression.
+function testOptionalChain() {
+  for (var i = 0; i < 100; ++i) {
+    var x = [1, 2, 3];
+    var o = {x};
+    o?.x.splice(0);
+  }
+}
+
+for (var i = 0; i < 5; ++i) { testOptionalChain(); }
diff --git a/js/src/jit-test/tests/optional-chain/fun-call-or-apply.js b/js/src/jit-test/tests/optional-chain/fun-call-or-apply.js
new file mode 100644
index 000000000..ed25de949
--- /dev/null
+++ b/js/src/jit-test/tests/optional-chain/fun-call-or-apply.js
@@ -0,0 +1,60 @@
+// Tests for JSOp::FunCall and JSOp::FunApply in optional calls.
+
+function f1() {
+  return 0;
+}
+function f2(a) {
+  return a * 2;
+}
+
+function funCall(fn) {
+  // Without arguments.
+  for (var i = 0; i < 100; ++i) {
+    assertEq(f1?.call(), 0);
+  }
+
+  // Only this-arg.
+  for (var i = 0; i < 100; ++i) {
+    assertEq(f1?.call(null), 0);
+  }
+
+  // With one arg.
+  for (var i = 0; i < 100; ++i) {
+    assertEq(f1?.call(null, 1), 0);
+    assertEq(f2?.call(null, 5), 10);
+  }
+
+  // With multiple args.
+  for (var i = 0; i < 100; ++i) {
+    assertEq(f1?.call(null, 1, 2, 3), 0);
+    assertEq(f2?.call(null, 4, 5, 6), 8);
+  }
+}
+
+for (var i = 0; i < 5; ++i) { funCall(); }
+
+function funApply(fn) {
+  // Without arguments.
+  for (var i = 0; i < 100; ++i) {
+    assertEq(f1?.apply(), 0);
+  }
+
+  // Only this-arg.
+  for (var i = 0; i < 100; ++i) {
+    assertEq(f1?.apply(null), 0);
+  }
+
+  // With one arg.
+  for (var i = 0; i < 100; ++i) {
+    assertEq(f1?.apply(null, [1]), 0);
+    assertEq(f2?.apply(null, [5]), 10);
+  }
+
+  // With multiple args.
+  for (var i = 0; i < 100; ++i) {
+    assertEq(f1?.apply(null, [1, 2, 3]), 0);
+    assertEq(f2?.apply(null, [4, 5, 6]), 8);
+  }
+}
+
+for (var i = 0; i < 5; ++i) { funApply(); }
+\ No newline at end of file