Backed out changeset 012e11e54840 (Bug 1101921) for build bustage on a CLOSED TREE
authorTerrence Cole <terrence@mozilla.com>
Fri, 21 Nov 2014 16:03:53 -0800
changeset 241290 fcf715632ae005b3fae926661a9ef01fb855db60
parent 241289 24bebb8f489a86f9d2a97aa594c11e237b5ded6f
child 241291 d0d36a9b8b7d9dfbd1dd78d3b926a75ad7298c8b
push id4311
push userraliiev@mozilla.com
push dateMon, 12 Jan 2015 19:37:41 +0000
treeherdermozilla-beta@150c9fed433b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1101921
milestone36.0a1
backs out012e11e54840c6d7472cbe5add2c8cbc60a9724d
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 012e11e54840 (Bug 1101921) for build bustage on a CLOSED TREE
js/public/HeapAPI.h
js/src/gc/Nursery.h
--- a/js/public/HeapAPI.h
+++ b/js/public/HeapAPI.h
@@ -93,17 +93,17 @@ AssertGCThingHasType(js::gc::Cell *cell,
 
 } /* namespace gc */
 } /* namespace js */
 
 namespace JS {
 struct Zone;
 
 /* Default size for the generational nursery in bytes. */
-const uint32_t DefaultNurseryBytes = 16 * ChunkSize;
+const uint32_t DefaultNurseryBytes = 16 * 1024 * 1024;
 
 /* Default maximum heap size in bytes to pass to JS_NewRuntime(). */
 const uint32_t DefaultHeapMaxBytes = 32 * 1024 * 1024;
 
 /*
  * We cannot expose the class hierarchy: the implementation is hidden. Instead
  * we provide cast functions with strong debug-mode assertions.
  */
--- a/js/src/gc/Nursery.h
+++ b/js/src/gc/Nursery.h
@@ -66,17 +66,17 @@ class Nursery
         heapStart_(0),
         heapEnd_(0),
         currentChunk_(0),
         numActiveChunks_(0),
         numNurseryChunks_(0)
     {}
     ~Nursery();
 
-    bool init(uint32_t maxNurseryBytes);
+    bool init(uint32_t numNurseryChunks);
 
     bool exists() const { return numNurseryChunks_ != 0; }
     size_t numChunks() const { return numNurseryChunks_; }
     size_t nurserySize() const { return numNurseryChunks_ << ChunkShift; }
 
     void enable();
     void disable();
     bool isEnabled() const { return numActiveChunks_ != 0; }