import changes from `dev' branch of rmottola/Arctic-Fox:

- Bug 1125481 - Replace FunctionInfo macros by variadic templates. r=Waldo (83244859f)
- Bug 1125481 - FunctionInfo: Remove useless inline keywords. r=Waldo (a13a186af)
- Bug 1169769 - Stop pretending js/src is a top-level directory. r=gps (2ba218bbf)
- Bug 1132189 - Rename "Analysis Helper" thread. r=bhackett (1a6b50af5)
- Bug 1172824: Initialize a few more members in VerifyPreTracer (CID 1304706); r=terrence (9fb0f4b03)
- Bug 1172824: Close dumpFile in case of error in DumpHeap (CID 1302587); r=jonco (e552f4320)
- Bug 1172641 - Fix class tests to not fail on builds where classes are not enabled r=shu (56474b665)
- Bug 1153244 - increase JS helper threads stack space when MOZ_TSAN is enabled; r=bhackett (cb5c9fc01)
- Bug 1172895: Raise the stack size limit for JS helper threads; r=bhackett (750cc5e19)
- Bug 1166101 - redirect aka os.file.redirect should not be available in fuzzing mode (09f574daa)
- Bug 1139376: Ionmonkey - Make removing of guards aware of phis, r=nbp (fb7cb028b)
- Bug 1171722 - Part 1: Add gcreason to GCSliceCallback. r=fitzgen (a9e4ae93b)
- Bug 1171722 - Part 2: Add gcreason::XPCONNECT_SHUTDOWN. r=terrence (815cbd630)
- Bug 1171722 - Part 3: Specify gcreason::XPCONNECT_SHUTDOWN during xpconnect shutdown. r=mccr8 (5123cda83)
- Bug 1171722 - Part 4: Don't warn if DebuggerOnGCRunnable::Enqueue fails during shutdown. r=mccr8 (efc3b8aab)
- Bug 1173513 - Point to SavedFrame.md docs from JSAPI comments; r=fitzgen (6c9bb84db)
- No Bug - Remove an unneeded annotation DONTBUILD; r=sfink (05fe03101)
- Bug 1171871 - Fix bytecode documentation comment for JSOP_NEWTARGET. r=efaust (bacbef1ce)
- Bug 1169460 - Fix imprecise computation in BacktrackingAllocator::minimalUse, r=sunfish. (7ea535e67)
- Bug 1170959 - Remove JS_GetPropertyDescriptor from a JSAPI test. r=efaust (8745b6d04)

xpcom/base/CycleCollectedJSRuntime.cpp

@@ -724,7 +724,11 @@ CycleCollectedJSRuntime::GCSliceCallback(JSRuntime* aRuntime,
   MOZ_ASSERT(self->Runtime() == aRuntime);
 
   if (aProgress == JS::GC_CYCLE_END) {
-    NS_WARN_IF(NS_FAILED(DebuggerOnGCRunnable::Enqueue(aRuntime, aDesc)));
+    JS::gcreason::Reason reason = aDesc.reason_;
+    NS_WARN_IF(NS_FAILED(DebuggerOnGCRunnable::Enqueue(aRuntime, aDesc)) &&
+               reason != JS::gcreason::SHUTDOWN_CC &&
+               reason != JS::gcreason::DESTROY_RUNTIME &&
+               reason != JS::gcreason::XPCONNECT_SHUTDOWN);
   }
 
   if (self->mPrevGCSliceCallback) {