Backed out changeset 9514a3c5e611 (bug 1617851) for causing bustages CLOSED TREE

js/src/jit/Ion.cpp

@@ -1850,10 +1850,8 @@ static bool ScriptIsTooLarge(JSContext* cx, JSScript* script) {
                                 : 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;
   }

js/src/jit/IonBuilder.cpp

@@ -190,15 +190,12 @@ IonBuilder::IonBuilder(JSContext* analysisContext, MIRGenerator& mirGen,
 
 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;
 }
 
@@ -210,15 +207,12 @@ mozilla::GenericErrorResult<AbortReason> IonBuilder::abort(AbortReason r,
   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;
 }