Backed out changeset 83f0e033450d (bug 1414318) for failing xpcshell's toolkit/components/terminator/tests/xpcshell/test_terminator_record.js on Linux x64 asan. r=backout a=backout on a CLOSED TREE
authorSebastian Hengst <archaeopteryx@coole-files.de>
Sat, 04 Nov 2017 17:38:52 +0100
changeset 443443 e437203962cc7d97b1646d09ed3061272a1df443
parent 443442 14fd26761bc4d10c5334abe50d7b6f3a5908f08d
child 443444 78568f0b106895cb7573fb1fa355d511ec9c87a3
child 443453 2091e08a707b942939c544edc0577575da730d57
child 443461 bfd94ce6cddd5977e8151437dd0ac755fd5d7775
child 443462 b8c117f591799d832026286ab33e70c411591c13
push id1618
push userCallek@gmail.com
push dateThu, 11 Jan 2018 17:45:48 +0000
treeherdermozilla-release@882ca853e05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout, backout
bugs1414318
milestone58.0a1
backs out83f0e033450d1dce9a9ce96b37b465ae50dacdb6
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
Backed out changeset 83f0e033450d (bug 1414318) for failing xpcshell's toolkit/components/terminator/tests/xpcshell/test_terminator_record.js on Linux x64 asan. r=backout a=backout on a CLOSED TREE MozReview-Commit-ID: wqauBr1VCl
toolkit/components/terminator/nsTerminator.cpp
--- a/toolkit/components/terminator/nsTerminator.cpp
+++ b/toolkit/components/terminator/nsTerminator.cpp
@@ -223,18 +223,17 @@ void RunWriter(void* arg)
   NS_SetCurrentThreadName("Shutdown Statistics Writer");
 
   MOZ_LSAN_INTENTIONALLY_LEAK_OBJECT(arg);
   // Shutdown will generally complete before we have a chance to
   // deallocate. This is not a leak.
 
   // Setup destinationPath and tmpFilePath
 
-  nsCString destinationPath;
-  destinationPath.Adopt(static_cast<char*>(arg));
+  nsCString destinationPath(static_cast<char*>(arg));
   nsAutoCString tmpFilePath;
   tmpFilePath.Append(destinationPath);
   tmpFilePath.AppendLiteral(".tmp");
 
   // Cleanup any file leftover from a previous run
   Unused << PR_Delete(tmpFilePath.get());
   Unused << PR_Delete(destinationPath.get());
 
@@ -357,22 +356,22 @@ nsTerminator::SelfInit()
 }
 
 // Actually launch these threads. This takes place at the first sign of shutdown.
 void
 nsTerminator::Start()
 {
   MOZ_ASSERT(!mInitialized);
   StartWatchdog();
-#if !defined(NS_FREE_PERMANENT_DATA)
-  // Only allow nsTerminator to write on non-leak-checked builds so we don't
-  // get leak warnings on shutdown for intentional leaks (see bug 1242084).
-  // This will be enabled again by bug 1255484 when 1255478 lands.
+#if !defined(DEBUG)
+  // Only allow nsTerminator to write on non-debug builds so we don't get leak warnings on
+  // shutdown for intentional leaks (see bug 1242084). This will be enabled again by bug
+  // 1255484 when 1255478 lands.
   StartWriter();
-#endif // !defined(NS_FREE_PERMANENT_DATA)
+#endif // !defined(DEBUG)
   mInitialized = true;
 }
 
 // Prepare, allocate and start the watchdog thread.
 // By design, it will never finish, nor be deallocated.
 void
 nsTerminator::StartWatchdog()
 {