wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1179264 - Only assert markedness of sampled scripts in JitcodeMap during finalization. (r=terrence)

Browse Source
This commit is contained in:
Shu-yu Guo 2015-07-01 21:57:28 -07:00
parent 326fc6a422
commit 5a46aa8c45
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/src/jit/JitcodeMap.cpp
View File

@ -12,6 +12,7 @@
#include "mozilla/UniquePtr.h"
#include "jsprf.h"
#include "gc/Marking.h"
#include "gc/Statistics.h"
#include "jit/BaselineJIT.h"
#include "jit/JitSpewer.h"
@ -475,8 +476,12 @@ JitcodeGlobalTable::lookupForSampler(void* ptr, JitcodeGlobalEntry* result, JSRu
// the sweep phase of the GC must be on stack, and on-stack frames must
// already be marked at the beginning of the sweep phase. This assumption
// is verified below.
if (rt->isHeapBusy() && rt->gc.state() == gc::SWEEP)
if (rt->isHeapBusy() &&
rt->gc.stats.currentPhase() >= gcstats::PHASE_FINALIZE_START &&
rt->gc.stats.currentPhase() <= gcstats::PHASE_FINALIZE_END)
{
MOZ_ASSERT(entry->isMarkedFromAnyThread(rt));
}
#endif
*result = *entry;