1 files changed, 0 insertions, 135 deletions
diff --git a/www/firefox/patches/patch-js__src__jsgc.cpp b/www/firefox/patches/patch-js__src__jsgc.cpp
deleted file mode 100644
index 6bcf834b1e0..00000000000
--- a/www/firefox/patches/patch-js__src__jsgc.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-$NetBSD: patch-js__src__jsgc.cpp,v 1.2 2013/06/26 11:32:12 ryoon Exp $
-
-From bugzilla, bug 840242,
-https://hg.mozilla.org/integration/mozilla-inbound/rev/49e4ff129351
-Use the runtime page size to control arena decommit.
-
-As a side effect, this removes the hard coded page-size == 4k requirement.
-
-
-diff js/src/jsgc.cpp js/src/jsgc.cpp
---- js/src/jsgc.cpp.orig	2013-05-11 21:19:34.000000000 +0200
-+++ js/src/jsgc.cpp	2013-06-10 13:49:13.000000000 +0200
-@@ -465,13 +465,15 @@ FinalizeArenas(FreeOp *fop,
- }
- 
- static inline Chunk *
--AllocChunk() {
--    return static_cast<Chunk *>(MapAlignedPages(ChunkSize, ChunkSize));
-+AllocChunk(JSRuntime *rt)
-+{
-+    return static_cast<Chunk *>(MapAlignedPages(rt, ChunkSize, ChunkSize));
- }
- 
- static inline void
--FreeChunk(Chunk *p) {
--    UnmapPages(static_cast<void *>(p), ChunkSize);
-+FreeChunk(JSRuntime *rt, Chunk *p)
-+{
-+    UnmapPages(rt, static_cast<void *>(p), ChunkSize);
- }
- 
- inline bool
-@@ -561,25 +563,25 @@ ChunkPool::expire(JSRuntime *rt, bool re
- }
- 
- static void
--FreeChunkList(Chunk *chunkListHead)
-+FreeChunkList(JSRuntime *rt, Chunk *chunkListHead)
- {
-     while (Chunk *chunk = chunkListHead) {
-         JS_ASSERT(!chunk->info.numArenasFreeCommitted);
-         chunkListHead = chunk->info.next;
--        FreeChunk(chunk);
-+        FreeChunk(rt, chunk);
-     }
- }
- 
- void
- ChunkPool::expireAndFree(JSRuntime *rt, bool releaseAll)
- {
--    FreeChunkList(expire(rt, releaseAll));
-+    FreeChunkList(rt, expire(rt, releaseAll));
- }
- 
- /* static */ Chunk *
- Chunk::allocate(JSRuntime *rt)
- {
--    Chunk *chunk = static_cast<Chunk *>(AllocChunk());
-+    Chunk *chunk = AllocChunk(rt);
- 
- #ifdef JSGC_ROOT_ANALYSIS
-     // Our poison pointers are not guaranteed to be invalid on 64-bit
-@@ -592,7 +594,7 @@ Chunk::allocate(JSRuntime *rt)
-     // were marked as uncommitted, but it's a little complicated to avoid
-     // clobbering pre-existing unrelated mappings.
-     while (IsPoisonedPtr(chunk))
--        chunk = static_cast<Chunk *>(AllocChunk());
-+        chunk = AllocChunk(rt);
- #endif
- 
-     if (!chunk)
-@@ -608,7 +610,7 @@ Chunk::release(JSRuntime *rt, Chunk *chu
- {
-     JS_ASSERT(chunk);
-     chunk->prepareToBeFreed(rt);
--    FreeChunk(chunk);
-+    FreeChunk(rt, chunk);
- }
- 
- inline void
-@@ -736,7 +738,7 @@ Chunk::fetchNextDecommittedArena()
-     decommittedArenas.unset(offset);
- 
-     Arena *arena = &arenas[offset];
--    MarkPagesInUse(arena, ArenaSize);
-+    MarkPagesInUse(info.runtime, arena, ArenaSize);
-     arena->aheader.setAsNotAllocated();
- 
-     return &arena->aheader;
-@@ -937,6 +939,8 @@ static const int64_t JIT_SCRIPT_RELEASE_
- JSBool
- js_InitGC(JSRuntime *rt, uint32_t maxbytes)
- {
-+    InitMemorySubsystem(rt);
-+
-     if (!rt->gcChunkSet.init(INITIAL_CHUNK_CAPACITY))
-         return false;
- 
-@@ -2051,6 +2055,9 @@ js::MaybeGC(JSContext *cx)
- static void
- DecommitArenasFromAvailableList(JSRuntime *rt, Chunk **availableListHeadp)
- {
-+    if (!DecommitEnabled(rt))
-+        return;
-+
-     Chunk *chunk = *availableListHeadp;
-     if (!chunk)
-         return;
-@@ -2102,7 +2109,7 @@ DecommitArenasFromAvailableList(JSRuntim
-                 Maybe<AutoUnlockGC> maybeUnlock;
-                 if (!rt->isHeapBusy())
-                     maybeUnlock.construct(rt);
--                ok = MarkPagesUnused(aheader->getArena(), ArenaSize);
-+                ok = MarkPagesUnused(rt, aheader->getArena(), ArenaSize);
-             }
- 
-             if (ok) {
-@@ -2132,7 +2139,7 @@ DecommitArenasFromAvailableList(JSRuntim
-                 JS_ASSERT(chunk->info.prevp);
-             }
- 
--            if (rt->gcChunkAllocationSinceLastGC) {
-+            if (rt->gcChunkAllocationSinceLastGC || !ok) {
-                 /*
-                  * The allocator thread has started to get new chunks. We should stop
-                  * to avoid decommitting arenas in just allocated chunks.
-@@ -2170,7 +2177,7 @@ ExpireChunksAndArenas(JSRuntime *rt, boo
- {
-     if (Chunk *toFree = rt->gcChunkPool.expire(rt, shouldShrink)) {
-         AutoUnlockGC unlock(rt);
--        FreeChunkList(toFree);
-+        FreeChunkList(rt, toFree);
-     }
- 
-     if (shouldShrink)