Backout e00a02282951 (bug 1232229) as we no longer need the diagnostics.

This commit is contained in:
Terrence Cole 2016-02-25 10:50:30 -08:00
parent 9d762350e6
commit a387f5b592
2 changed files with 1 additions and 8 deletions

View File

@ -963,7 +963,6 @@ void
Chunk::addArenaToFreeList(JSRuntime* rt, ArenaHeader* aheader)
{
MOZ_ASSERT(!aheader->allocated());
MOZ_RELEASE_ASSERT(uintptr_t(info.freeArenasHead) != uintptr_t(UINT64_C(0x4b4b4b4b4b4b4b4b)));
aheader->next = info.freeArenasHead;
info.freeArenasHead = aheader;
++info.numArenasFreeCommitted;
@ -2297,7 +2296,6 @@ ArenaList::relocateArenas(ArenaHeader* toRelocate, ArenaHeader* relocated, Slice
toRelocate = arena->next;
RelocateArena(arena, sliceBudget);
// Prepend to list of relocated arenas
MOZ_RELEASE_ASSERT(uintptr_t(relocated) != uintptr_t(UINT64_C(0x4b4b4b4b4b4b4b4b)));
arena->next = relocated;
relocated = arena;
stats.count(gcstats::STAT_ARENA_RELOCATED);
@ -2846,8 +2844,6 @@ GCRuntime::protectAndHoldArenas(ArenaHeader* arenaList)
ArenaHeader* next = arena->next;
if (!next) {
// Prepend to hold list before we protect the memory.
MOZ_RELEASE_ASSERT(
uintptr_t(relocatedArenasToRelease) != uintptr_t(UINT64_C(0x4b4b4b4b4b4b4b4b)));
arena->next = relocatedArenasToRelease;
relocatedArenasToRelease = arenaList;
}
@ -3477,7 +3473,7 @@ GCRuntime::sweepBackgroundThings(ZoneList& zones, LifoAlloc& freeBlocks, ThreadT
for (unsigned index = 0 ; index < BackgroundFinalizePhases[phase].length ; ++index) {
AllocKind kind = BackgroundFinalizePhases[phase].kinds[index];
ArenaHeader* arenas = zone->arenas.arenaListsToSweep[kind];
MOZ_RELEASE_ASSERT(uintptr_t(arenas) != uintptr_t(UINT64_C(0x4b4b4b4b4b4b4b4b)));
MOZ_RELEASE_ASSERT(uintptr_t(arenas) != uintptr_t(-1));
if (arenas)
ArenaLists::backgroundFinalize(&fop, arenas, &emptyArenas);
}

View File

@ -307,7 +307,6 @@ struct SortedArenaListSegment
void append(ArenaHeader* aheader) {
MOZ_ASSERT(aheader);
MOZ_ASSERT_IF(head, head->getAllocKind() == aheader->getAllocKind());
MOZ_RELEASE_ASSERT(uintptr_t(aheader) != uintptr_t(UINT64_C(0x4b4b4b4b4b4b4b4b)));
*tailp = aheader;
tailp = &aheader->next;
}
@ -318,7 +317,6 @@ struct SortedArenaListSegment
// description of ArenaList), but from the perspective of a SortedArenaList
// this makes no difference.
void linkTo(ArenaHeader* aheader) {
MOZ_RELEASE_ASSERT(uintptr_t(aheader) != uintptr_t(UINT64_C(0x4b4b4b4b4b4b4b4b)));
*tailp = aheader;
}
};
@ -547,7 +545,6 @@ class SortedArenaList
void extractEmpty(ArenaHeader** empty) {
SortedArenaListSegment& segment = segments[thingsPerArena_];
if (segment.head) {
MOZ_RELEASE_ASSERT(uintptr_t(*empty) != uintptr_t(UINT64_C(0x4b4b4b4b4b4b4b4b)));
*segment.tailp = *empty;
*empty = segment.head;
segment.clear();