Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 23:35:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Back out changeset 57593f27594a (bug 1225474) for Memory-allocationSamplingProbability-02.js jit-test failures

Browse Source 
CLOSED TREE
This commit is contained in:
Phil Ringnalda 2015-11-18 18:50:17 -08:00
parent 04f94361ed
commit 76ff406c1a
3 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/src/builtin/TestingFunctions.cpp
View File

@ -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;
}

6
js/src/jit-test/tests/saved-stacks/bug-1225474.js
View File

@ -1,6 +0,0 @@
// setSavedStacksRNGState shouldn't crash regardless of the seed value passed.
setSavedStacksRNGState(0);
setSavedStacksRNGState({});
setSavedStacksRNGState(false);
setSavedStacksRNGState(NaN);

6
js/src/vm/SavedStacks.h
View File

@ -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);