Bug 1416235 - Don't crash when there are late writes in the Windows coverage build. r=froydnj
authorMarco Castelluccio <mcastelluccio@mozilla.com>
Sat, 11 Nov 2017 12:29:00 +0100
changeset 391500 15fa308daad34deadae4bf219cb984cf559578c2
parent 391499 0d54bbebadb2879bf73f492e9bf216a458e22878
child 391501 baa3bbe7a9d075d8a90d8c0d899ae730f3eca6dc
push id97283
push usermcastelluccio@mozilla.com
push dateMon, 13 Nov 2017 14:18:42 +0000
treeherdermozilla-inbound@15fa308daad3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1416235
milestone59.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 1416235 - Don't crash when there are late writes in the Windows coverage build. r=froydnj
toolkit/xre/nsAppRunner.cpp
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -3757,26 +3757,30 @@ namespace mozilla {
 
 static void SetShutdownChecks() {
   // Set default first. On debug builds we crash. On nightly and local
   // builds we record. Nightlies will then send the info via telemetry,
   // but it is usefull to have the data in about:telemetry in local builds
   // too.
 
 #ifdef DEBUG
+#if defined(MOZ_CODE_COVERAGE) && defined(XP_WIN)
+  gShutdownChecks = SCM_NOTHING;
+#else
   gShutdownChecks = SCM_CRASH;
+#endif // MOZ_CODE_COVERAGE && XP_WIN
 #else
   const char* releaseChannel = NS_STRINGIFY(MOZ_UPDATE_CHANNEL);
   if (strcmp(releaseChannel, "nightly") == 0 ||
       strcmp(releaseChannel, "default") == 0) {
     gShutdownChecks = SCM_RECORD;
   } else {
     gShutdownChecks = SCM_NOTHING;
   }
-#endif
+#endif // DEBUG
 
   // We let an environment variable override the default so that addons
   // authors can use it for debugging shutdown with released firefox versions.
   const char* mozShutdownChecksEnv = PR_GetEnv("MOZ_SHUTDOWN_CHECKS");
   if (mozShutdownChecksEnv) {
     if (strcmp(mozShutdownChecksEnv, "crash") == 0) {
       gShutdownChecks = SCM_CRASH;
     } else if (strcmp(mozShutdownChecksEnv, "record") == 0) {