Bug 1359245 - Fix compiler error on CLOSED TREE
authorBill McCloskey <billm@mozilla.com>
Thu, 27 Apr 2017 15:53:19 -0700
changeset 569885 cbf267741097838510073510a677b96110b7e831
parent 569791 ede9819237516b2e48b95b1d3e95f8eafe53b9fd
child 569886 b078ad0ac4a3b06ad9525170426a2d311ea0e9e4
child 569982 497dbf087ad59eeeb898427b80152ead617c89c9
push id56298
push userbmo:rbarker@mozilla.com
push dateFri, 28 Apr 2017 00:16:23 +0000
bugs1359245
milestone55.0a1
Bug 1359245 - Fix compiler error on CLOSED TREE MozReview-Commit-ID: 57cVUcTV1Rv
js/src/jsgc.cpp
js/src/jspubtd.h
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -7403,17 +7403,16 @@ AutoAssertNoNurseryAlloc::AutoAssertNoNu
 }
 
 AutoAssertNoNurseryAlloc::~AutoAssertNoNurseryAlloc()
 {
     TlsContext.get()->allowNurseryAlloc();
 }
 
 JS::AutoEnterCycleCollection::AutoEnterCycleCollection(JSRuntime* rt)
-  : runtime(rt)
 {
     MOZ_ASSERT(!JS::CurrentThreadIsHeapBusy());
     TlsContext.get()->heapState = HeapState::CycleCollecting;
 }
 
 JS::AutoEnterCycleCollection::~AutoEnterCycleCollection()
 {
     MOZ_ASSERT(JS::CurrentThreadIsHeapCycleCollecting());
--- a/js/src/jspubtd.h
+++ b/js/src/jspubtd.h
@@ -196,18 +196,16 @@ CurrentThreadIsHeapCycleCollecting()
     return CurrentThreadHeapState() == HeapState::CycleCollecting;
 }
 
 // Decorates the Unlinking phase of CycleCollection so that accidental use
 // of barriered accessors results in assertions instead of leaks.
 class MOZ_STACK_CLASS JS_PUBLIC_API(AutoEnterCycleCollection)
 {
 #ifdef DEBUG
-    JSRuntime* runtime;
-
   public:
     explicit AutoEnterCycleCollection(JSRuntime* rt);
     ~AutoEnterCycleCollection();
 #else
   public:
     explicit AutoEnterCycleCollection(JSRuntime* rt) {}
     ~AutoEnterCycleCollection() {}
 #endif