Backed out changeset 6eebf397a8c2 (bug 1166041)
authorWes Kocher <wkocher@mozilla.com>
Wed, 29 Jul 2015 16:46:18 -0700
changeset 281643 cb821c634326bf02d05c673c6a4f614f19a9ae67
parent 281642 eabf1cf9b676e9eb0a8790d4ec1dba0f78121bfc
child 281644 5738b6629d1451ef0cd4e708a13108d0e81302ef
push id3894
push usermconley@mozilla.com
push dateThu, 30 Jul 2015 00:27:47 +0000
bugs1166041
milestone42.0a1
backs out6eebf397a8c29941862a164d3c3209707ae1faec
Backed out changeset 6eebf397a8c2 (bug 1166041)
js/src/gc/Nursery.cpp
js/src/jsgc.cpp
--- a/js/src/gc/Nursery.cpp
+++ b/js/src/gc/Nursery.cpp
@@ -633,17 +633,16 @@ js::Nursery::freeMallocedBuffers()
         freeMallocedBuffersTask->runFromMainThread(runtime());
 
     MOZ_ASSERT(mallocedBuffers.empty());
 }
 
 void
 js::Nursery::waitBackgroundFreeEnd()
 {
-    MOZ_ASSERT(freeMallocedBuffersTask);
     freeMallocedBuffersTask->join();
 }
 
 void
 js::Nursery::sweep()
 {
 #ifdef JS_GC_ZEAL
     /* Poison the nursery contents so touching a freed object will crash. */
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -1313,20 +1313,16 @@ GCRuntime::init(uint32_t maxbytes, uint3
         return false;
 
     return true;
 }
 
 void
 GCRuntime::finish()
 {
-    /* Wait for the nursery sweeping to end. */
-    if (rt->gc.nursery.isEnabled())
-        rt->gc.nursery.waitBackgroundFreeEnd();
-
     /*
      * Wait until the background finalization and allocation stops and the
      * helper thread shuts down before we forcefully release any remaining GC
      * memory.
      */
     helperState.finish();
     allocTask.cancel(GCParallelTask::CancelAndWait);