Adding upstream version 115.7.0esr.upstream/115.7.0esrupstream

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

1 files changed, 33 insertions, 0 deletions

diff --git a/js/src/jit-test/tests/basic/testAddInconvertibleObjectInconvertibleObject.js b/js/src/jit-test/tests/basic/testAddInconvertibleObjectInconvertibleObject.js
new file mode 100644
index 0000000000..5004dbbe5c
--- /dev/null
+++ b/js/src/jit-test/tests/basic/testAddInconvertibleObjectInconvertibleObject.js
@@ -0,0 +1,33 @@
+function testAddInconvertibleObjectInconvertibleObject()
+{
+  var count1 = 0;
+  function toString1() { ++count1; if (count1 == 95) return {}; return "" + count1; }
+  var o1 = {valueOf: undefined, toString: toString1};
+  var count2 = 0;
+  function toString2() { ++count2; if (count2 == 95) return {}; return "" + count2; }
+  var o2 = {valueOf: undefined, toString: toString2};
+
+  var threw = false;
+  try
+  {
+    for (var i = 0; i < 100; i++)
+        var q = o1 + o2;
+  }
+  catch (e)
+  {
+    threw = true;
+    if (i !== 94)
+      return "expected i === 94, got " + i;
+    if (q !== "9494")
+      return "expected q === '9494', got " + q + " (type " + typeof q + ")";
+    if (count1 !== 95)
+      return "expected count1 === 95, got " + count1;
+    if (count2 !== 94)
+      return "expected count2 === 94, got " + count2;
+  }
+  if (!threw)
+    return "expected throw with o1 + o2";
+
+  return "pass";
+}
+assertEq(testAddInconvertibleObjectInconvertibleObject(), "pass");