Bug 1140773: Address review comments. r=shu
authorJim Blandy <jimb@mozilla.com>
Sat, 21 Mar 2015 23:37:47 -0700
changeset 265265 45366e6959e2949aa30e7357960662c8287c300a
parent 265264 b40f0e7c51a08fac107491abc0fee29015cf7965
child 265266 99865532c12f15675a60031057d720f9656afb0a
child 265280 498032321f32a4a29b8eede5ad0696a5f35af0d7
push id830
push userraliiev@mozilla.com
push dateFri, 19 Jun 2015 19:24:37 +0000
treeherdermozilla-release@932614382a68 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersshu
bugs1140773
milestone39.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 1140773: Address review comments. r=shu
js/src/gc/Nursery.cpp
js/src/jsgc.cpp
js/src/vm/HelperThreads.cpp
--- a/js/src/gc/Nursery.cpp
+++ b/js/src/gc/Nursery.cpp
@@ -37,17 +37,17 @@ using mozilla::ArrayLength;
 using mozilla::PodCopy;
 using mozilla::PodZero;
 
 struct js::Nursery::FreeHugeSlotsTask : public GCParallelTask
 {
     explicit FreeHugeSlotsTask(FreeOp *fop) : fop_(fop) {}
     bool init() { return slots_.init(); }
     void transferSlotsToFree(HugeSlotsSet &slotsToFree);
-    ~FreeHugeSlotsTask() { join(); }
+    ~FreeHugeSlotsTask() override { join(); }
 
   private:
     FreeOp *fop_;
     HugeSlotsSet slots_;
 
     virtual void run() override;
 };
 
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -2398,17 +2398,17 @@ struct UpdateCellPointersTask : public G
 #ifdef DEBUG
     static const unsigned ArenasToProcess = 16;
 #else
     static const unsigned ArenasToProcess = 256;
 #endif
 
     UpdateCellPointersTask() : rt_(nullptr), source_(nullptr), arenaList_(nullptr) {}
     void init(JSRuntime *rt, ArenasToUpdate *source, AutoLockHelperThreadState& lock);
-    ~UpdateCellPointersTask() { join(); }
+    ~UpdateCellPointersTask() override { join(); }
 
   private:
     JSRuntime *rt_;
     ArenasToUpdate *source_;
     ArenaHeader *arenaList_;
 
     virtual void run() override;
     void getArenasToUpdate(AutoLockHelperThreadState& lock);
--- a/js/src/vm/HelperThreads.cpp
+++ b/js/src/vm/HelperThreads.cpp
@@ -741,18 +741,20 @@ GlobalHelperThreadState::canStartGCParal
 }
 
 js::GCParallelTask::~GCParallelTask()
 {
     // Only most-derived classes' destructors may do the join: base class
     // destructors run after those for derived classes' members, so a join in a
     // base class can't ensure that the task is done using the members. All we
     // can do now is check that someone has previously stopped the task.
+#ifdef DEBUG
     AutoLockHelperThreadState helperLock;
     MOZ_ASSERT(state == NotStarted);
+#endif
 }
 
 bool
 js::GCParallelTask::startWithLockHeld()
 {
     MOZ_ASSERT(HelperThreadState().isLocked());
 
     // Tasks cannot be started twice.