Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-15 14:25:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 650161 - Fix build errors due to recent changes and test failure in TypedObject/inlineopaque.js r=terrence

Browse Source
This commit is contained in:
Jon Coppeard 2014-10-14 09:39:47 +01:00
parent 603b1bb0fe
commit 8c6c28c754
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/builtin/TypedObject.h
View File

@ -516,7 +516,7 @@ class StructTypeDescr : public ComplexTypeDescr
}
NativeObject &maybeForwardedFieldInfoObject(size_t slot) const {
return *MaybeForwarded(&fieldInfoObject(slot));
return MaybeForwarded(&getReservedSlot(slot).toObject())->as<NativeObject>();
}
};

2
js/src/gc/GCRuntime.h
View File

@ -472,6 +472,7 @@ class GCRuntime
template <AllowGC allowGC>
static void *refillFreeListFromAnyThread(ThreadSafeContext *cx, AllocKind thingKind);
static void *refillFreeListInGC(Zone *zone, AllocKind thingKind);
private:
// For ArenaLists::allocateFromArena()
@ -483,7 +484,6 @@ class GCRuntime
static void *refillFreeListFromMainThread(JSContext *cx, AllocKind thingKind);
static void *refillFreeListOffMainThread(ExclusiveContext *cx, AllocKind thingKind);
static void *refillFreeListPJS(ForkJoinContext *cx, AllocKind thingKind);
static void *refillFreeListInGC(Zone *zone, AllocKind thingKind);
/*
* Return the list of chunks that can be released outside the GC lock.

2
js/src/jsgc.cpp
View File

@ -2157,7 +2157,7 @@ RelocateCell(Zone *zone, TenuredCell *src, AllocKind thingKind, size_t thingSize
MOZ_ASSERT(zone == src->zone());
void *dstAlloc = zone->allocator.arenas.allocateFromFreeList(thingKind, thingSize);
if (!dstAlloc)
dstAlloc = js::gc::ArenaLists::refillFreeListInGC(zone, thingKind);
dstAlloc = GCRuntime::refillFreeListInGC(zone, thingKind);
if (!dstAlloc)
return false;
TenuredCell *dst = TenuredCell::fromPointer(dstAlloc);