Bug 1291646 - Remove unused field from nursery r=terrence
authorJon Coppeard <jcoppeard@mozilla.com>
Thu, 04 Aug 2016 10:39:21 +0100
changeset 308234 b09cad2800f9ccac6c464ed33f4897bb52241b0e
parent 308160 242fcdd569953d285ede59d1b8ed973500e89d5d
child 308235 0c5cb3940888fa96e01149c33df31437e3bf0941
push id31092
push usercbook@mozilla.com
push dateFri, 05 Aug 2016 10:16:59 +0000
treeherderautoland@b97dd7dd3cb9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersterrence
bugs1291646
milestone51.0a1
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
Bug 1291646 - Remove unused field from nursery r=terrence
js/src/gc/Nursery.cpp
js/src/gc/Nursery.h
--- a/js/src/gc/Nursery.cpp
+++ b/js/src/gc/Nursery.cpp
@@ -69,16 +69,24 @@ struct js::Nursery::SweepAction
     SweepAction* next;
 
 #if JS_BITS_PER_WORD == 32
   protected:
     uint32_t padding;
 #endif
 };
 
+#ifdef JS_GC_ZEAL
+struct js::Nursery::Canary
+{
+    uintptr_t magicValue;
+    Canary* next;
+};
+#endif
+
 js::Nursery::Nursery(JSRuntime* rt)
   : runtime_(rt)
   , position_(0)
   , currentStart_(0)
   , currentEnd_(0)
   , heapStart_(0)
   , heapEnd_(0)
   , currentChunk_(0)
--- a/js/src/gc/Nursery.h
+++ b/js/src/gc/Nursery.h
@@ -335,25 +335,19 @@ class Nursery
      *       sweep. This is because this structure is used to help implement
      *       stable object hashing and we have to break the cycle somehow.
      */
     using CellsWithUniqueIdSet = HashSet<gc::Cell*, PointerHasher<gc::Cell*, 3>, SystemAllocPolicy>;
     CellsWithUniqueIdSet cellsWithUid_;
 
     struct SweepAction;
     SweepAction* sweepActions_;
-    SweepAction* reservedSweepAction_;
 
 #ifdef JS_GC_ZEAL
-    struct Canary
-    {
-        uintptr_t magicValue;
-        Canary* next;
-    };
-
+    struct Canary;
     Canary* lastCanary_;
 #endif
 
     /* The maximum number of bytes allowed to reside in nursery buffers. */
     static const size_t MaxNurseryBufferSize = 1024;
 
     /* The amount of space in the mapped nursery available to allocations. */
     static const size_t NurseryChunkUsableSize = gc::ChunkSize - sizeof(gc::ChunkTrailer);