Bug 1457475 - Demote MOZ_DIAGNOSTIC_ASSERT to MOZ_ASSERT. r=jonco
authorJan de Mooij <jdemooij@mozilla.com>
Mon, 30 Apr 2018 10:47:06 +0200
changeset 469811 45603dbcb3bb9ba2c85cb6f424d44bd65fc1f0fe
parent 469810 f38524bd2735d9885d9f5c69980f755f9816bed3
child 469812 dded77ad7ac088527f220743cece9aca2f3ff764
push id9179
push userarchaeopteryx@coole-files.de
push dateThu, 03 May 2018 15:28:18 +0000
treeherdermozilla-beta@e6f9ade8bca7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjonco
bugs1457475
milestone61.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 1457475 - Demote MOZ_DIAGNOSTIC_ASSERT to MOZ_ASSERT. r=jonco
js/src/vm/HelperThreads.cpp
--- a/js/src/vm/HelperThreads.cpp
+++ b/js/src/vm/HelperThreads.cpp
@@ -1664,17 +1664,17 @@ GlobalHelperThreadState::finishParseTask
     });
 
     if (!ok)
         return nullptr;
 
     if (!script) {
         // No error was reported, but no script produced. Assume we hit out of
         // memory.
-        MOZ_DIAGNOSTIC_ASSERT(false);
+        MOZ_ASSERT(false, "Expected script");
         ReportOutOfMemory(cx);
         return nullptr;
     }
 
     // The Debugger only needs to be told about the topmost script that was compiled.
     Debugger::onNewScript(cx, script);
 
     return script;
@@ -1701,17 +1701,17 @@ GlobalHelperThreadState::finishParseTask
     });
 
     if (!ok)
         return false;
 
     if (scripts.length() != expectedLength) {
         // No error was reported, but fewer scripts produced than expected.
         // Assume we hit out of memory.
-        MOZ_DIAGNOSTIC_ASSERT(false);
+        MOZ_ASSERT(false, "Expected more scripts");
         ReportOutOfMemory(cx);
         return false;
     }
 
     // The Debugger only needs to be told about the topmost script that was compiled.
     JS::RootedScript rooted(cx);
     for (auto& script : scripts) {
         MOZ_ASSERT(script->isGlobalCode());