From 76ff406c1a4db7e1c0b8f2f9da104b868de8d787 Mon Sep 17 00:00:00 2001 From: Phil Ringnalda Date: Wed, 18 Nov 2015 18:50:17 -0800 Subject: [PATCH] Back out changeset 57593f27594a (bug 1225474) for Memory-allocationSamplingProbability-02.js jit-test failures CLOSED TREE --- js/src/builtin/TestingFunctions.cpp | 4 +--- js/src/jit-test/tests/saved-stacks/bug-1225474.js | 6 ------ js/src/vm/SavedStacks.h | 6 +----- 3 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 js/src/jit-test/tests/saved-stacks/bug-1225474.js diff --git a/js/src/builtin/TestingFunctions.cpp b/js/src/builtin/TestingFunctions.cpp index e261afbbcc63..e6e300f787d7 100644 --- a/js/src/builtin/TestingFunctions.cpp +++ b/js/src/builtin/TestingFunctions.cpp @@ -895,9 +895,7 @@ SetSavedStacksRNGState(JSContext* cx, unsigned argc, Value* vp) if (!ToInt32(cx, args[0], &seed)) return false; - // Either one or the other of the seed arguments must be non-zero; - // make this true no matter what value 'seed' has. - cx->compartment()->savedStacks().setRNGState(seed, (seed + 1) * 33); + cx->compartment()->savedStacks().setRNGState(seed, seed * 33); return true; } diff --git a/js/src/jit-test/tests/saved-stacks/bug-1225474.js b/js/src/jit-test/tests/saved-stacks/bug-1225474.js deleted file mode 100644 index ca0dcaa31ce4..000000000000 --- a/js/src/jit-test/tests/saved-stacks/bug-1225474.js +++ /dev/null @@ -1,6 +0,0 @@ -// setSavedStacksRNGState shouldn't crash regardless of the seed value passed. - -setSavedStacksRNGState(0); -setSavedStacksRNGState({}); -setSavedStacksRNGState(false); -setSavedStacksRNGState(NaN); diff --git a/js/src/vm/SavedStacks.h b/js/src/vm/SavedStacks.h index 9d343aa3603e..1b07e68b862f 100644 --- a/js/src/vm/SavedStacks.h +++ b/js/src/vm/SavedStacks.h @@ -170,12 +170,8 @@ class SavedStacks { void trace(JSTracer* trc); uint32_t count(); void clear(); - void chooseSamplingProbability(JSCompartment*); - - // Set the sampling random number generator's state to |state0| and - // |state1|. One or the other must be non-zero. See the comments for - // mozilla::non_crypto::XorShift128PlusRNG::setState for details. void setRNGState(uint64_t state0, uint64_t state1) { bernoulli.setRandomState(state0, state1); } + void chooseSamplingProbability(JSCompartment*); size_t sizeOfExcludingThis(mozilla::MallocSizeOf mallocSizeOf);