mozilla-central: changeset 161065:1ab3b1938d32146e32010c3a973dbc002d1ff669

author	Andy Wingo <wingo@igalia.com>
	Wed, 18 Dec 2013 11:01:32 +0100
changeset 161065	1ab3b1938d32146e32010c3a973dbc002d1ff669
parent 161064	44ba76de09549fb137c09ec10e28baaea377df13
child 161066	0d36904aa4bd44e4b118a3832bd2b20c652de485
push id	25866
push user	ryanvm@gmail.com
push date	Thu, 19 Dec 2013 02:15:01 +0000
treeherder	mozilla-central@940c52e93281 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	mccr8
bugs	951483, 945813
milestone	29.0a1
first release with	nightly linux32 5c7fa2bfea8b / 29.0a1 / 20131219030202 / files nightly linux64 5c7fa2bfea8b / 29.0a1 / 20131219030202 / files nightly mac 5c7fa2bfea8b / 29.0a1 / 20131219030202 / files nightly win32 5c7fa2bfea8b / 29.0a1 / 20131219030202 / files nightly win64 5c7fa2bfea8b / 29.0a1 / 20131219030202 / files
last release without	nightly linux32 862cb6a1cc88 / 29.0a1 / 20131218030217 / files nightly linux64 862cb6a1cc88 / 29.0a1 / 20131218030217 / files nightly mac 862cb6a1cc88 / 29.0a1 / 20131218030217 / files nightly win32 862cb6a1cc88 / 29.0a1 / 20131218030217 / files nightly win64 862cb6a1cc88 / 29.0a1 / 20131218030217 / files

--- a/xpcom/base/nsCycleCollector.cpp
+++ b/xpcom/base/nsCycleCollector.cpp
@@ -2967,16 +2967,17 @@ nsCycleCollector::ShutdownCollect()
 {
     SliceBudget unlimitedBudget;
     uint32_t i;
     for (i = 0; i < DEFAULT_SHUTDOWN_COLLECTIONS; ++i) {
         if (!Collect(ShutdownCC, unlimitedBudget, nullptr)) {
             break;
         }
     }
+    NS_ASSERTION(i < NORMAL_SHUTDOWN_COLLECTIONS, "Extra shutdown CC");
 }
 
 static void
 PrintPhase(const char *aPhase)
 {
 #ifdef DEBUG_PHASES
     printf("cc: begin %s on %s\n", aPhase,
            NS_IsMainThread() ? "mainthread" : "worker");