mozilla-central: changeset 146440:a36c944c929ed44a0ca361743cab150eca1be7c6

author	Andrew McCreight <continuation@gmail.com>
	Tue, 10 Sep 2013 08:56:36 -0700
changeset 146440	a36c944c929ed44a0ca361743cab150eca1be7c6
parent 146439	d722282fdc4dde056610a04cb4db82c16e018aac
child 146441	fb46afe7f48b31e86a5a78f2c0b7fa6ce25c9f2a
push id	25260
push user	ryanvm@gmail.com
push date	Wed, 11 Sep 2013 00:29:30 +0000
treeherder	mozilla-central@f73bed2856a8 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	smaug
bugs	913881
milestone	26.0a1
first release with	nightly linux32 9e9f74116749 / 26.0a1 / 20130911030258 / files nightly linux64 9e9f74116749 / 26.0a1 / 20130911030258 / files nightly mac 9e9f74116749 / 26.0a1 / 20130911030258 / files nightly win32 9e9f74116749 / 26.0a1 / 20130911030258 / files nightly win64 9e9f74116749 / 26.0a1 / 20130911030258 / files
last release without	nightly linux32 e5ca10a2b3d0 / 26.0a1 / 20130910030254 / files nightly linux64 e5ca10a2b3d0 / 26.0a1 / 20130910030254 / files nightly mac e5ca10a2b3d0 / 26.0a1 / 20130910030254 / files nightly win32 e5ca10a2b3d0 / 26.0a1 / 20130910030254 / files nightly win64 e5ca10a2b3d0 / 26.0a1 / 20130910030254 / files

--- a/xpcom/base/nsCycleCollector.cpp
+++ b/xpcom/base/nsCycleCollector.cpp
@@ -2106,16 +2106,17 @@ nsCycleCollector::FreeSnowWhite(bool aUn
 void
 nsCycleCollector::ForgetSkippable(bool aRemoveChildlessNodes,
                                   bool aAsyncSnowWhiteFreeing)
 {
     CheckThreadSafety();
     if (mJSRuntime) {
         mJSRuntime->PrepareForForgetSkippable();
     }
+    MOZ_ASSERT(!mScanInProgress, "Don't forget skippable or free snow-white while scan is in progress.");
     mPurpleBuf.RemoveSkippable(this, aRemoveChildlessNodes,
                                aAsyncSnowWhiteFreeing, mForgetSkippableCB);
 }
 
 MOZ_NEVER_INLINE void
 nsCycleCollector::MarkRoots(GCGraphBuilder &aBuilder)
 {
     mGraph.mRootCount = aBuilder.Count();