Merging upstream version 126.0.

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

1 files changed, 14 insertions, 4 deletions

diff --git a/js/src/jit-test/lib/pretenure.js b/js/src/jit-test/lib/pretenure.js
index 214f1d44d1..c1184fefc4 100644
--- a/js/src/jit-test/lib/pretenure.js
+++ b/js/src/jit-test/lib/pretenure.js
@@ -22,8 +22,12 @@ function setupPretenureTest() {
   gczeal(0);
 
   // Restrict nursery size so we can fill it quicker, and ensure it is resized.
-  gcparam("minNurseryBytes", 1024 * 1024);
-  gcparam("maxNurseryBytes", 1024 * 1024);
+  let size = 1024 * 1024;
+  if (gcparam("semispaceNurseryEnabled")) {
+    size *= 2;
+  }
+  gcparam("minNurseryBytes", size);
+  gcparam("maxNurseryBytes", size);
 
   // Limit allocation threshold so we trigger major GCs sooner.
   gcparam("allocationThreshold", 1 /* MB */);
@@ -67,8 +71,14 @@ function allocateArrays(count, longLived) {
 }
 
 function gcCounts() {
-  return { minor: gcparam("minorGCNumber"),
-           major: gcparam("majorGCNumber") };
+  let major = gcparam("majorGCNumber")
+  let minor = gcparam("minorGCNumber");
+
+  // Only report minor collections that didn't happen as part of a major GC.
+  assertEq(minor >= major, true);
+  minor -= major;
+
+  return { minor, major };
 }
 
 function runTestAndCountCollections(thunk) {