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 881333 - Fix break in GGC builds.

Browse Source
This commit is contained in:
Brian Hackett 2013-06-10 16:08:55 -06:00
parent 2f793672fb
commit 59384aa9a7
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/ion/CodeGenerator.cpp
View File

@ -5309,7 +5309,7 @@ CodeGenerator::link()
if (graph.numConstants())
ionScript->copyConstants(graph.constantPool());
#ifdef JSGC_GENERATIONAL
cx->runtime->gcStoreBuffer.putGeneric(IonScriptRefs(script));
cx->runtime()->gcStoreBuffer.putGeneric(IonScriptRefs(script));
#endif
JS_ASSERT(graph.mir().numScripts() > 0);
ionScript->copyScriptEntries(graph.mir().scripts());

12
js/src/jsgcinlines.h
View File

@ -473,8 +473,8 @@ template <typename T, AllowGC allowGC>
inline T *
TryNewNurseryGCThing(JSContext *cx, size_t thingSize)
{
JS_ASSERT(!IsAtomsCompartment(cx->compartment));
JSRuntime *rt = cx->runtime;
JS_ASSERT(!IsAtomsCompartment(cx->compartment()));
JSRuntime *rt = cx->runtime();
Nursery &nursery = rt->gcNursery;
T *t = static_cast<T *>(nursery.allocate(thingSize));
if (t)
@ -539,11 +539,11 @@ NewGCThing(JSContext *cx, AllocKind kind, size_t thingSize, InitialHeap heap)
t->arenaHeader()->allocatedDuringIncremental);
#if defined(JSGC_GENERATIONAL) && defined(JS_GC_ZEAL)
if (cx->runtime->gcVerifyPostData &&
ShouldNurseryAllocate(cx->runtime->gcVerifierNursery, kind, heap))
if (cx->runtime()->gcVerifyPostData &&
ShouldNurseryAllocate(cx->runtime()->gcVerifierNursery, kind, heap))
{
JS_ASSERT(!IsAtomsCompartment(cx->compartment));
cx->runtime->gcVerifierNursery.insertPointer(t);
JS_ASSERT(!IsAtomsCompartment(cx->compartment()));
cx->runtime()->gcVerifierNursery.insertPointer(t);
}
#endif