Backed out changeset 9514a3c5e611 (bug 1617851) for causing bustages CLOSED TREE
authorCiure Andrei <aciure@mozilla.com>
Wed, 01 Apr 2020 21:09:54 +0300
changeset 521654 011ad9ff26088e341b0aebecd4424523b7759e88
parent 521653 80c61ca1429b683f62a2e9eb7339be14d13519fb
child 521655 0592b572c58de39307828c80c076ff135da649aa
push id37272
push usercsabou@mozilla.com
push dateWed, 01 Apr 2020 21:26:59 +0000
treeherdermozilla-central@011ad9ff2608 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1617851
milestone76.0a1
backs out9514a3c5e611a24d1dacd19b9daeb5e1cc1b2827
first release with
nightly linux32
011ad9ff2608 / 76.0a1 / 20200401212659 / files
nightly linux64
011ad9ff2608 / 76.0a1 / 20200401212659 / files
nightly mac
011ad9ff2608 / 76.0a1 / 20200401212659 / files
nightly win32
011ad9ff2608 / 76.0a1 / 20200401212659 / files
nightly win64
011ad9ff2608 / 76.0a1 / 20200401212659 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 9514a3c5e611 (bug 1617851) for causing bustages CLOSED TREE
js/src/jit/Ion.cpp
js/src/jit/IonBuilder.cpp
--- a/js/src/jit/Ion.cpp
+++ b/js/src/jit/Ion.cpp
@@ -1845,20 +1845,18 @@ static bool ScriptIsTooLarge(JSContext* 
   size_t maxScriptSize = canCompileOffThread
                              ? JitOptions.ionMaxScriptSize
                              : JitOptions.ionMaxScriptSizeMainThread;
   size_t maxLocalsAndArgs = canCompileOffThread
                                 ? JitOptions.ionMaxLocalsAndArgs
                                 : JitOptions.ionMaxLocalsAndArgsMainThread;
 
   if (script->length() > maxScriptSize || numLocalsAndArgs > maxLocalsAndArgs) {
-    JitSpew(JitSpew_IonAbort,
-            "Script too large (%zu bytes) (%zu locals/args) @ %s:%u:%u",
-            script->length(), numLocalsAndArgs, script->filename(),
-            script->lineno(), script->column());
+    JitSpew(JitSpew_IonAbort, "Script too large (%zu bytes) (%zu locals/args)",
+            script->length(), numLocalsAndArgs);
     TrackIonAbort(cx, script, script->code(), "too large");
     return true;
   }
 
   return false;
 }
 
 bool CanIonCompileScript(JSContext* cx, JSScript* script) {
--- a/js/src/jit/IonBuilder.cpp
+++ b/js/src/jit/IonBuilder.cpp
@@ -185,45 +185,39 @@ IonBuilder::IonBuilder(JSContext* analys
 
   if (!info_->isAnalysis()) {
     script()->jitScript()->setIonCompiledOrInlined();
   }
 }
 
 mozilla::GenericErrorResult<AbortReason> IonBuilder::abort(AbortReason r) {
   auto res = mirGen_.abort(r);
-  unsigned line, column;
 #ifdef DEBUG
-  line = PCToLineNumber(script(), pc, &column);
+  JitSpew(JitSpew_IonAbort, "aborted @ %s:%d", script()->filename(),
+          PCToLineNumber(script(), pc));
 #else
-  line = script()->lineno();
-  column = script()->column();
+  JitSpew(JitSpew_IonAbort, "aborted @ %s", script()->filename());
 #endif
-  JitSpew(JitSpew_IonAbort, "aborted @ %s:%u:%u", script()->filename(), line,
-          column);
   return res;
 }
 
 mozilla::GenericErrorResult<AbortReason> IonBuilder::abort(AbortReason r,
                                                            const char* message,
                                                            ...) {
   // Don't call PCToLineNumber in release builds.
   va_list ap;
   va_start(ap, message);
   auto res = mirGen_.abortFmt(r, message, ap);
   va_end(ap);
-  unsigned line, column;
 #ifdef DEBUG
-  line = PCToLineNumber(script(), pc, &column);
+  JitSpew(JitSpew_IonAbort, "aborted @ %s:%d", script()->filename(),
+          PCToLineNumber(script(), pc));
 #else
-  line = script()->lineno();
-  column = script()->column();
+  JitSpew(JitSpew_IonAbort, "aborted @ %s", script()->filename());
 #endif
-  JitSpew(JitSpew_IonAbort, "aborted @ %s:%u:%u", script()->filename(), line,
-          column);
   return res;
 }
 
 IonBuilder* IonBuilder::outermostBuilder() {
   IonBuilder* builder = this;
   while (builder->callerBuilder_) {
     builder = builder->callerBuilder_;
   }