Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-21 09:15:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1464321 - Changed return type of two methods in JSScript with relative format string change. r=arai

Browse Source
This commit is contained in:
maharsh312 2018-05-27 04:00:06 +05:30
parent 886ec674df
commit f431bdeaf2
27 changed files with 68 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/gc/Tracer.cpp
View File

@ -441,7 +441,7 @@ JS_GetTraceThingInfo(char* buf, size_t bufsize, JSTracer* trc, void* thing,
case JS::TraceKind::Script: case JS::TraceKind::Script:
{ {
JSScript* script = static_cast<JSScript*>(thing); JSScript* script = static_cast<JSScript*>(thing);
snprintf(buf, bufsize, " %s:%zu", script->filename(), script->lineno()); snprintf(buf, bufsize, " %s:%u", script->filename(), script->lineno());
break; break;
} }

20
js/src/jit/BaselineBailouts.cpp
View File

@ -678,7 +678,7 @@ InitFromBailout(JSContext* cx, size_t frameNo,
// | ReturnAddr | <-- return into main jitcode after IC // | ReturnAddr | <-- return into main jitcode after IC
// +===============+ // +===============+
JitSpew(JitSpew_BaselineBailouts, " Unpacking %s:%zu", script->filename(), script->lineno()); JitSpew(JitSpew_BaselineBailouts, " Unpacking %s:%u", script->filename(), script->lineno());
JitSpew(JitSpew_BaselineBailouts, " [BASELINE-JS FRAME]"); JitSpew(JitSpew_BaselineBailouts, " [BASELINE-JS FRAME]");
// Calculate and write the previous frame pointer value. // Calculate and write the previous frame pointer value.
@ -1065,7 +1065,7 @@ InitFromBailout(JSContext* cx, size_t frameNo,
#endif #endif
#ifdef JS_JITSPEW #ifdef JS_JITSPEW
JitSpew(JitSpew_BaselineBailouts, " Resuming %s pc offset %d (op %s) (line %d) of %s:%zu", JitSpew(JitSpew_BaselineBailouts, " Resuming %s pc offset %d (op %s) (line %d) of %s:%u",
resumeAfter ? "after" : "at", (int) pcOff, CodeName[op], resumeAfter ? "after" : "at", (int) pcOff, CodeName[op],
PCToLineNumber(script, pc), script->filename(), script->lineno()); PCToLineNumber(script, pc), script->filename(), script->lineno());
JitSpew(JitSpew_BaselineBailouts, " Bailout kind: %s", JitSpew(JitSpew_BaselineBailouts, " Bailout kind: %s",
@ -1241,7 +1241,7 @@ InitFromBailout(JSContext* cx, size_t frameNo,
ReportOutOfMemory(cx); ReportOutOfMemory(cx);
return false; return false;
} }
snprintf(buf, len, "%s %s %s on line %u of %s:%zu", snprintf(buf, len, "%s %s %s on line %u of %s:%u",
BailoutKindString(bailoutKind), BailoutKindString(bailoutKind),
resumeAfter ? "after" : "at", resumeAfter ? "after" : "at",
CodeName[op], CodeName[op],
@ -1565,7 +1565,7 @@ jit::BailoutIonToBaseline(JSContext* cx, JitActivation* activation,
// | ||||| | // | ||||| |
// +---------------+ // +---------------+
JitSpew(JitSpew_BaselineBailouts, "Bailing to baseline %s:%zu (IonScript=%p) (FrameType=%d)", JitSpew(JitSpew_BaselineBailouts, "Bailing to baseline %s:%u (IonScript=%p) (FrameType=%d)",
iter.script()->filename(), iter.script()->lineno(), (void*) iter.ionScript(), iter.script()->filename(), iter.script()->lineno(), (void*) iter.ionScript(),
(int) prevFrameType); (int) prevFrameType);
@ -1613,7 +1613,7 @@ jit::BailoutIonToBaseline(JSContext* cx, JitActivation* activation,
RootedFunction callee(cx, iter.maybeCallee()); RootedFunction callee(cx, iter.maybeCallee());
RootedScript scr(cx, iter.script()); RootedScript scr(cx, iter.script());
if (callee) { if (callee) {
JitSpew(JitSpew_BaselineBailouts, " Callee function (%s:%zu)", JitSpew(JitSpew_BaselineBailouts, " Callee function (%s:%u)",
scr->filename(), scr->lineno()); scr->filename(), scr->lineno());
} else { } else {
JitSpew(JitSpew_BaselineBailouts, " No callee!"); JitSpew(JitSpew_BaselineBailouts, " No callee!");
@ -1739,7 +1739,7 @@ InvalidateAfterBailout(JSContext* cx, HandleScript outerScript, const char* reas
static void static void
HandleBoundsCheckFailure(JSContext* cx, HandleScript outerScript, HandleScript innerScript) HandleBoundsCheckFailure(JSContext* cx, HandleScript outerScript, HandleScript innerScript)
{ {
JitSpew(JitSpew_IonBailouts, "Bounds check failure %s:%zu, inlined into %s:%zu", JitSpew(JitSpew_IonBailouts, "Bounds check failure %s:%u, inlined into %s:%u",
innerScript->filename(), innerScript->lineno(), innerScript->filename(), innerScript->lineno(),
outerScript->filename(), outerScript->lineno()); outerScript->filename(), outerScript->lineno());
@ -1754,7 +1754,7 @@ HandleBoundsCheckFailure(JSContext* cx, HandleScript outerScript, HandleScript i
static void static void
HandleShapeGuardFailure(JSContext* cx, HandleScript outerScript, HandleScript innerScript) HandleShapeGuardFailure(JSContext* cx, HandleScript outerScript, HandleScript innerScript)
{ {
JitSpew(JitSpew_IonBailouts, "Shape guard failure %s:%zu, inlined into %s:%zu", JitSpew(JitSpew_IonBailouts, "Shape guard failure %s:%u, inlined into %s:%u",
innerScript->filename(), innerScript->lineno(), innerScript->filename(), innerScript->lineno(),
outerScript->filename(), outerScript->lineno()); outerScript->filename(), outerScript->lineno());
@ -1769,7 +1769,7 @@ HandleShapeGuardFailure(JSContext* cx, HandleScript outerScript, HandleScript in
static void static void
HandleBaselineInfoBailout(JSContext* cx, HandleScript outerScript, HandleScript innerScript) HandleBaselineInfoBailout(JSContext* cx, HandleScript outerScript, HandleScript innerScript)
{ {
JitSpew(JitSpew_IonBailouts, "Baseline info failure %s:%zu, inlined into %s:%zu", JitSpew(JitSpew_IonBailouts, "Baseline info failure %s:%u, inlined into %s:%u",
innerScript->filename(), innerScript->lineno(), innerScript->filename(), innerScript->lineno(),
outerScript->filename(), outerScript->lineno()); outerScript->filename(), outerScript->lineno());
@ -1779,7 +1779,7 @@ HandleBaselineInfoBailout(JSContext* cx, HandleScript outerScript, HandleScript
static void static void
HandleLexicalCheckFailure(JSContext* cx, HandleScript outerScript, HandleScript innerScript) HandleLexicalCheckFailure(JSContext* cx, HandleScript outerScript, HandleScript innerScript)
{ {
JitSpew(JitSpew_IonBailouts, "Lexical check failure %s:%zu, inlined into %s:%zu", JitSpew(JitSpew_IonBailouts, "Lexical check failure %s:%u, inlined into %s:%u",
innerScript->filename(), innerScript->lineno(), innerScript->filename(), innerScript->lineno(),
outerScript->filename(), outerScript->lineno()); outerScript->filename(), outerScript->lineno());
@ -1982,7 +1982,7 @@ jit::FinishBailoutToBaseline(BaselineBailoutInfo* bailoutInfo)
} }
JitSpew(JitSpew_BaselineBailouts, JitSpew(JitSpew_BaselineBailouts,
" Restored outerScript=(%s:%zu,%u) innerScript=(%s:%zu,%u) (bailoutKind=%u)", " Restored outerScript=(%s:%u,%u) innerScript=(%s:%u,%u) (bailoutKind=%u)",
outerScript->filename(), outerScript->lineno(), outerScript->getWarmUpCount(), outerScript->filename(), outerScript->lineno(), outerScript->getWarmUpCount(),
innerScript->filename(), innerScript->lineno(), innerScript->getWarmUpCount(), innerScript->filename(), innerScript->lineno(), innerScript->getWarmUpCount(),
(unsigned) bailoutKind); (unsigned) bailoutKind);

8
js/src/jit/BaselineCompiler.cpp
View File

@ -86,10 +86,10 @@ BaselineCompiler::addPCMappingEntry(bool addIndexEntry)
MethodStatus MethodStatus
BaselineCompiler::compile() BaselineCompiler::compile()
{ {
JitSpew(JitSpew_BaselineScripts, "Baseline compiling script %s:%zu (%p)", JitSpew(JitSpew_BaselineScripts, "Baseline compiling script %s:%u (%p)",
script->filename(), script->lineno(), script); script->filename(), script->lineno(), script);
JitSpew(JitSpew_Codegen, "# Emitting baseline code for script %s:%zu", JitSpew(JitSpew_Codegen, "# Emitting baseline code for script %s:%u",
script->filename(), script->lineno()); script->filename(), script->lineno());
TraceLoggerThread* logger = TraceLoggerForCurrentThread(cx); TraceLoggerThread* logger = TraceLoggerForCurrentThread(cx);
@ -222,7 +222,7 @@ BaselineCompiler::compile()
baselineScript->setMethod(code); baselineScript->setMethod(code);
baselineScript->setTemplateEnvironment(templateEnv); baselineScript->setTemplateEnvironment(templateEnv);
JitSpew(JitSpew_BaselineScripts, "Created BaselineScript %p (raw %p) for %s:%zu", JitSpew(JitSpew_BaselineScripts, "Created BaselineScript %p (raw %p) for %s:%u",
(void*) baselineScript.get(), (void*) code->raw(), (void*) baselineScript.get(), (void*) code->raw(),
script->filename(), script->lineno()); script->filename(), script->lineno());
@ -278,7 +278,7 @@ BaselineCompiler::compile()
// Always register a native => bytecode mapping entry, since profiler can be // Always register a native => bytecode mapping entry, since profiler can be
// turned on with baseline jitcode on stack, and baseline jitcode cannot be invalidated. // turned on with baseline jitcode on stack, and baseline jitcode cannot be invalidated.
{ {
JitSpew(JitSpew_Profiling, "Added JitcodeGlobalEntry for baseline script %s:%zu (%p)", JitSpew(JitSpew_Profiling, "Added JitcodeGlobalEntry for baseline script %s:%u (%p)",
script->filename(), script->lineno(), baselineScript.get()); script->filename(), script->lineno(), baselineScript.get());
// Generate profiling string. // Generate profiling string.

6
js/src/jit/BaselineDebugModeOSR.cpp
View File

@ -320,7 +320,7 @@ SpewPatchBaselineFrame(uint8_t* oldReturnAddress, uint8_t* newReturnAddress,
JSScript* script, ICEntry::Kind frameKind, jsbytecode* pc) JSScript* script, ICEntry::Kind frameKind, jsbytecode* pc)
{ {
JitSpew(JitSpew_BaselineDebugModeOSR, JitSpew(JitSpew_BaselineDebugModeOSR,
"Patch return %p -> %p on BaselineJS frame (%s:%zu) from %s at %s", "Patch return %p -> %p on BaselineJS frame (%s:%u) from %s at %s",
oldReturnAddress, newReturnAddress, script->filename(), script->lineno(), oldReturnAddress, newReturnAddress, script->filename(), script->lineno(),
ICEntryKindToString(frameKind), CodeName[(JSOp)*pc]); ICEntryKindToString(frameKind), CodeName[(JSOp)*pc]);
} }
@ -330,7 +330,7 @@ SpewPatchBaselineFrameFromExceptionHandler(uint8_t* oldReturnAddress, uint8_t* n
JSScript* script, jsbytecode* pc) JSScript* script, jsbytecode* pc)
{ {
JitSpew(JitSpew_BaselineDebugModeOSR, JitSpew(JitSpew_BaselineDebugModeOSR,
"Patch return %p -> %p on BaselineJS frame (%s:%zu) from exception handler at %s", "Patch return %p -> %p on BaselineJS frame (%s:%u) from exception handler at %s",
oldReturnAddress, newReturnAddress, script->filename(), script->lineno(), oldReturnAddress, newReturnAddress, script->filename(), script->lineno(),
CodeName[(JSOp)*pc]); CodeName[(JSOp)*pc]);
} }
@ -667,7 +667,7 @@ RecompileBaselineScriptForDebugMode(JSContext* cx, JSScript* script,
if (oldBaselineScript->hasDebugInstrumentation() == observing) if (oldBaselineScript->hasDebugInstrumentation() == observing)
return true; return true;
JitSpew(JitSpew_BaselineDebugModeOSR, "Recompiling (%s:%zu) for %s", JitSpew(JitSpew_BaselineDebugModeOSR, "Recompiling (%s:%u) for %s",
script->filename(), script->lineno(), observing ? "DEBUGGING" : "NORMAL EXECUTION"); script->filename(), script->lineno(), observing ? "DEBUGGING" : "NORMAL EXECUTION");
AutoKeepTypeScripts keepTypes(cx); AutoKeepTypeScripts keepTypes(cx);

2
js/src/jit/BaselineIC.cpp
View File

@ -2105,7 +2105,7 @@ TryAttachCallStub(JSContext* cx, ICCall_Fallback* stub, HandleScript script, jsb
fun->native(), constructing ? "yes" : "no", isSpread ? "yes" : "no"); fun->native(), constructing ? "yes" : "no", isSpread ? "yes" : "no");
} else { } else {
JitSpew(JitSpew_BaselineIC, JitSpew(JitSpew_BaselineIC,
" Generating Call_Scripted stub (fun=%p, %s:%zu, cons=%s, spread=%s)", " Generating Call_Scripted stub (fun=%p, %s:%u, cons=%s, spread=%s)",
fun.get(), fun->nonLazyScript()->filename(), fun->nonLazyScript()->lineno(), fun.get(), fun->nonLazyScript()->filename(), fun->nonLazyScript()->lineno(),
constructing ? "yes" : "no", isSpread ? "yes" : "no"); constructing ? "yes" : "no", isSpread ? "yes" : "no");
} }

4
js/src/jit/C1Spewer.cpp
View File

@ -27,8 +27,8 @@ C1Spewer::beginFunction(MIRGraph* graph, JSScript* script)
out_.printf("begin_compilation\n"); out_.printf("begin_compilation\n");
if (script) { if (script) {
out_.printf(" name \"%s:%zu\"\n", script->filename(), script->lineno()); out_.printf(" name \"%s:%u\"\n", script->filename(), script->lineno());
out_.printf(" method \"%s:%zu\"\n", script->filename(), script->lineno()); out_.printf(" method \"%s:%u\"\n", script->filename(), script->lineno());
} else { } else {
out_.printf(" name \"wasm compilation\"\n"); out_.printf(" name \"wasm compilation\"\n");
out_.printf(" method \"wasm compilation\"\n"); out_.printf(" method \"wasm compilation\"\n");

4
js/src/jit/CodeGenerator.cpp
View File

@ -5357,7 +5357,7 @@ CodeGenerator::maybeCreateScriptCounts()
JSScript* innerScript = block->info().script(); JSScript* innerScript = block->info().script();
description = (char*) js_calloc(200); description = (char*) js_calloc(200);
if (description) { if (description) {
snprintf(description, 200, "%s:%zu", snprintf(description, 200, "%s:%u",
innerScript->filename(), innerScript->lineno()); innerScript->filename(), innerScript->lineno());
} }
} }
@ -10145,7 +10145,7 @@ CodeGenerator::generateWasm(wasm::SigIdDesc sigId, wasm::BytecodeOffset trapOffs
bool bool
CodeGenerator::generate() CodeGenerator::generate()
{ {
JitSpew(JitSpew_Codegen, "# Emitting code for script %s:%zu", JitSpew(JitSpew_Codegen, "# Emitting code for script %s:%u",
gen->info().script()->filename(), gen->info().script()->filename(),
gen->info().script()->lineno()); gen->info().script()->lineno());

14
js/src/jit/Ion.cpp
View File

@ -2159,7 +2159,7 @@ IonCompile(JSContext* cx, JSScript* script,
// If possible, compile the script off thread. // If possible, compile the script off thread.
if (options.offThreadCompilationAvailable()) { if (options.offThreadCompilationAvailable()) {
JitSpew(JitSpew_IonSyncLogs, "Can't log script %s:%zu" JitSpew(JitSpew_IonSyncLogs, "Can't log script %s:%u"
". (Compiled on background thread.)", ". (Compiled on background thread.)",
builderScript->filename(), builderScript->lineno()); builderScript->filename(), builderScript->lineno());
@ -2355,7 +2355,7 @@ Compile(JSContext* cx, HandleScript script, BaselineFrame* osrFrame, jsbytecode*
} }
if (!CanIonCompileScript(cx, script)) { if (!CanIonCompileScript(cx, script)) {
JitSpew(JitSpew_IonAbort, "Aborted compilation of %s:%zu", script->filename(), script->lineno()); JitSpew(JitSpew_IonAbort, "Aborted compilation of %s:%u", script->filename(), script->lineno());
return Method_CantCompile; return Method_CantCompile;
} }
@ -2625,7 +2625,7 @@ jit::IonCompileScriptForBaseline(JSContext* cx, BaselineFrame* frame, jsbytecode
// Ensure that Ion-compiled code is available. // Ensure that Ion-compiled code is available.
JitSpew(JitSpew_BaselineOSR, JitSpew(JitSpew_BaselineOSR,
"WarmUpCounter for %s:%zu reached %d at pc %p, trying to switch to Ion!", "WarmUpCounter for %s:%u reached %d at pc %p, trying to switch to Ion!",
script->filename(), script->lineno(), (int) script->getWarmUpCount(), (void*) pc); script->filename(), script->lineno(), (int) script->getWarmUpCount(), (void*) pc);
MethodStatus stat; MethodStatus stat;
@ -2729,7 +2729,7 @@ InvalidateActivation(FreeOp* fop, const JitActivationIterator& activations, bool
else if (frame.isBailoutJS()) else if (frame.isBailoutJS())
type = "Bailing"; type = "Bailing";
JitSpew(JitSpew_IonInvalidate, JitSpew(JitSpew_IonInvalidate,
"#%zu %s JS frame @ %p, %s:%zu (fun: %p, script: %p, pc %p)", "#%zu %s JS frame @ %p, %s:%u (fun: %p, script: %p, pc %p)",
frameno, type, frame.fp(), frame.script()->maybeForwardedFilename(), frameno, type, frame.fp(), frame.script()->maybeForwardedFilename(),
frame.script()->lineno(), frame.maybeCallee(), (JSScript*)frame.script(), frame.script()->lineno(), frame.maybeCallee(), (JSScript*)frame.script(),
frame.returnAddressToFp()); frame.returnAddressToFp());
@ -2887,7 +2887,7 @@ jit::Invalidate(TypeZone& types, FreeOp* fop,
if (!ionScript) if (!ionScript)
continue; continue;
JitSpew(JitSpew_IonInvalidate, " Invalidate %s:%zu, IonScript %p", JitSpew(JitSpew_IonInvalidate, " Invalidate %s:%u, IonScript %p",
info.script()->filename(), info.script()->lineno(), ionScript); info.script()->filename(), info.script()->lineno(), ionScript);
// Keep the ion script alive during the invalidation and flag this // Keep the ion script alive during the invalidation and flag this
@ -2979,7 +2979,7 @@ jit::Invalidate(JSContext* cx, JSScript* script, bool resetUses, bool cancelOffT
filename = "<unknown>"; filename = "<unknown>";
// Construct the descriptive string. // Construct the descriptive string.
UniqueChars buf = JS_smprintf("Invalidate %s:%zu", filename, script->lineno()); UniqueChars buf = JS_smprintf("Invalidate %s:%u", filename, script->lineno());
// Ignore the event on allocation failure. // Ignore the event on allocation failure.
if (buf) { if (buf) {
@ -3015,7 +3015,7 @@ jit::FinishInvalidation(FreeOp* fop, JSScript* script)
void void
jit::ForbidCompilation(JSContext* cx, JSScript* script) jit::ForbidCompilation(JSContext* cx, JSScript* script)
{ {
JitSpew(JitSpew_IonAbort, "Disabling Ion compilation of script %s:%zu", JitSpew(JitSpew_IonAbort, "Disabling Ion compilation of script %s:%u",
script->filename(), script->lineno()); script->filename(), script->lineno());
CancelOffThreadIonCompile(script); CancelOffThreadIonCompile(script);

14
js/src/jit/IonBuilder.cpp
View File

@ -325,7 +325,7 @@ IonBuilder::InliningDecision
IonBuilder::DontInline(JSScript* targetScript, const char* reason) IonBuilder::DontInline(JSScript* targetScript, const char* reason)
{ {
if (targetScript) { if (targetScript) {
JitSpew(JitSpew_Inlining, "Cannot inline %s:%zu: %s", JitSpew(JitSpew_Inlining, "Cannot inline %s:%u: %s",
targetScript->filename(), targetScript->lineno(), reason); targetScript->filename(), targetScript->lineno(), reason);
} else { } else {
JitSpew(JitSpew_Inlining, "Cannot inline: %s", reason); JitSpew(JitSpew_Inlining, "Cannot inline: %s", reason);
@ -751,11 +751,11 @@ IonBuilder::build()
#ifdef JS_JITSPEW #ifdef JS_JITSPEW
if (info().isAnalysis()) { if (info().isAnalysis()) {
JitSpew(JitSpew_IonScripts, "Analyzing script %s:%zu (%p) %s", JitSpew(JitSpew_IonScripts, "Analyzing script %s:%u (%p) %s",
script()->filename(), script()->lineno(), (void*)script(), script()->filename(), script()->lineno(), (void*)script(),
AnalysisModeString(info().analysisMode())); AnalysisModeString(info().analysisMode()));
} else { } else {
JitSpew(JitSpew_IonScripts, "%sompiling script %s:%zu (%p) (warmup-counter=%" PRIu32 ", level=%s)", JitSpew(JitSpew_IonScripts, "%sompiling script %s:%u (%p) (warmup-counter=%" PRIu32 ", level=%s)",
(script()->hasIonScript() ? "Rec" : "C"), (script()->hasIonScript() ? "Rec" : "C"),
script()->filename(), script()->lineno(), (void*)script(), script()->filename(), script()->lineno(), (void*)script(),
script()->getWarmUpCount(), OptimizationLevelString(optimizationInfo().level())); script()->getWarmUpCount(), OptimizationLevelString(optimizationInfo().level()));
@ -925,7 +925,7 @@ IonBuilder::buildInline(IonBuilder* callerBuilder, MResumePoint* callerResumePoi
MOZ_TRY(init()); MOZ_TRY(init());
JitSpew(JitSpew_IonScripts, "Inlining script %s:%zu (%p)", JitSpew(JitSpew_IonScripts, "Inlining script %s:%u (%p)",
script()->filename(), script()->lineno(), (void*)script()); script()->filename(), script()->lineno(), (void*)script());
callerBuilder_ = callerBuilder; callerBuilder_ = callerBuilder;
@ -1214,7 +1214,7 @@ IonBuilder::initEnvironmentChain(MDefinition* callee)
void void
IonBuilder::initArgumentsObject() IonBuilder::initArgumentsObject()
{ {
JitSpew(JitSpew_IonMIR, "%s:%zu - Emitting code to initialize arguments object! block=%p", JitSpew(JitSpew_IonMIR, "%s:%u - Emitting code to initialize arguments object! block=%p",
script()->filename(), script()->lineno(), current); script()->filename(), script()->lineno(), current);
MOZ_ASSERT(info().needsArgsObj()); MOZ_ASSERT(info().needsArgsObj());
@ -1426,7 +1426,7 @@ GetOrCreateControlFlowGraph(TempAllocator& tempAlloc, JSScript* script,
} }
if (JitSpewEnabled(JitSpew_CFG)) { if (JitSpewEnabled(JitSpew_CFG)) {
JitSpew(JitSpew_CFG, "Generating graph for %s:%zu", JitSpew(JitSpew_CFG, "Generating graph for %s:%u",
script->filename(), script->lineno()); script->filename(), script->lineno());
Fprinter& print = JitSpewPrinter(); Fprinter& print = JitSpewPrinter();
cfg->dump(print, script); cfg->dump(print, script);
@ -4028,7 +4028,7 @@ IonBuilder::makeInliningDecision(JSObject* targetArg, CallInfo& callInfo)
info().analysisMode() != Analysis_DefiniteProperties) info().analysisMode() != Analysis_DefiniteProperties)
{ {
trackOptimizationOutcome(TrackedOutcome::CantInlineNotHot); trackOptimizationOutcome(TrackedOutcome::CantInlineNotHot);
JitSpew(JitSpew_Inlining, "Cannot inline %s:%zu: callee is insufficiently hot.", JitSpew(JitSpew_Inlining, "Cannot inline %s:%u: callee is insufficiently hot.",
targetScript->filename(), targetScript->lineno()); targetScript->filename(), targetScript->lineno());
return InliningDecision_WarmUpCountTooLow; return InliningDecision_WarmUpCountTooLow;
} }

2
js/src/jit/IonIC.cpp
View File

@ -158,7 +158,7 @@ IonGetPropertyIC::update(JSContext* cx, HandleScript outerScript, IonGetProperty
// 2) There's no need to dynamically monitor the return type. This would // 2) There's no need to dynamically monitor the return type. This would
// be complicated since (due to GVN) there can be multiple pc's // be complicated since (due to GVN) there can be multiple pc's
// associated with a single idempotent cache. // associated with a single idempotent cache.
JitSpew(JitSpew_IonIC, "Invalidating from idempotent cache %s:%zu", JitSpew(JitSpew_IonIC, "Invalidating from idempotent cache %s:%u",
outerScript->filename(), outerScript->lineno()); outerScript->filename(), outerScript->lineno());
outerScript->setInvalidatedIdempotentCache(); outerScript->setInvalidatedIdempotentCache();

6
js/src/jit/JSJitFrameIter.cpp
View File

@ -314,7 +314,7 @@ JSJitFrameIter::dumpBaseline() const
fprintf(stderr, " global frame, no callee\n"); fprintf(stderr, " global frame, no callee\n");
} }
fprintf(stderr, " file %s line %zu\n", fprintf(stderr, " file %s line %u\n",
script()->filename(), script()->lineno()); script()->filename(), script()->lineno());
JSContext* cx = TlsContext.get(); JSContext* cx = TlsContext.get();
@ -431,7 +431,7 @@ JSJitFrameIter::verifyReturnAddressUsingNativeToBytecodeMap()
JitSpew(JitSpew_Profiling, "Found bytecode location of depth %d:", depth); JitSpew(JitSpew_Profiling, "Found bytecode location of depth %d:", depth);
for (size_t i = 0; i < location.length(); i++) { for (size_t i = 0; i < location.length(); i++) {
JitSpew(JitSpew_Profiling, " %s:%zu - %zu", JitSpew(JitSpew_Profiling, " %s:%u - %zu",
location[i].script->filename(), location[i].script->lineno(), location[i].script->filename(), location[i].script->lineno(),
size_t(location[i].pc - location[i].script->code())); size_t(location[i].pc - location[i].script->code()));
} }
@ -444,7 +444,7 @@ JSJitFrameIter::verifyReturnAddressUsingNativeToBytecodeMap()
MOZ_ASSERT_IF(idx < location.length() - 1, inlineFrames.more()); MOZ_ASSERT_IF(idx < location.length() - 1, inlineFrames.more());
JitSpew(JitSpew_Profiling, JitSpew(JitSpew_Profiling,
"Match %d: ION %s:%zu(%zu) vs N2B %s:%zu(%zu)", "Match %d: ION %s:%u(%zu) vs N2B %s:%u(%zu)",
(int)idx, (int)idx,
inlineFrames.script()->filename(), inlineFrames.script()->filename(),
inlineFrames.script()->lineno(), inlineFrames.script()->lineno(),

2
js/src/jit/JSONSpewer.cpp
View File

@ -25,7 +25,7 @@ JSONSpewer::beginFunction(JSScript* script)
{ {
beginObject(); beginObject();
if (script) if (script)
formatProperty("name", "%s:%zu", script->filename(), script->lineno()); formatProperty("name", "%s:%u", script->filename(), script->lineno());
else else
property("name", "wasm compilation"); property("name", "wasm compilation");
beginListProperty("passes"); beginListProperty("passes");

2
js/src/jit/JitFrames.cpp
View File

@ -2354,7 +2354,7 @@ InlineFrameIterator::dump() const
fprintf(stderr, " global frame, no callee\n"); fprintf(stderr, " global frame, no callee\n");
} }
fprintf(stderr, " file %s line %zu\n", fprintf(stderr, " file %s line %u\n",
script()->filename(), script()->lineno()); script()->filename(), script()->lineno());
fprintf(stderr, " script = %p, pc = %p\n", (void*) script(), pc()); fprintf(stderr, " script = %p, pc = %p\n", (void*) script(), pc());

6
js/src/jit/JitcodeMap.cpp
View File

@ -328,7 +328,7 @@ JitcodeGlobalEntry::createScriptString(JSContext* cx, JSScript* script, size_t*
size_t linenoLength = 0; size_t linenoLength = 0;
char linenoStr[15]; char linenoStr[15];
if (hasName || (script->functionNonDelazifying() || script->isForEval())) { if (hasName || (script->functionNonDelazifying() || script->isForEval())) {
linenoLength = SprintfLiteral(linenoStr, "%zu", script->lineno()); linenoLength = SprintfLiteral(linenoStr, "%u", script->lineno());
hasLineno = true; hasLineno = true;
} }
@ -1547,13 +1547,13 @@ JitcodeIonTable::WriteIonTable(CompactBufferWriter& writer,
MOZ_ASSERT(writer.length() == 0); MOZ_ASSERT(writer.length() == 0);
MOZ_ASSERT(scriptListSize > 0); MOZ_ASSERT(scriptListSize > 0);
JitSpew(JitSpew_Profiling, "Writing native to bytecode map for %s:%zu (%zu entries)", JitSpew(JitSpew_Profiling, "Writing native to bytecode map for %s:%u (%zu entries)",
scriptList[0]->filename(), scriptList[0]->lineno(), scriptList[0]->filename(), scriptList[0]->lineno(),
mozilla::PointerRangeSize(start, end)); mozilla::PointerRangeSize(start, end));
JitSpew(JitSpew_Profiling, " ScriptList of size %d", int(scriptListSize)); JitSpew(JitSpew_Profiling, " ScriptList of size %d", int(scriptListSize));
for (uint32_t i = 0; i < scriptListSize; i++) { for (uint32_t i = 0; i < scriptListSize; i++) {
JitSpew(JitSpew_Profiling, " Script %d - %s:%zu", JitSpew(JitSpew_Profiling, " Script %d - %s:%u",
int(i), scriptList[i]->filename(), scriptList[i]->lineno()); int(i), scriptList[i]->filename(), scriptList[i]->lineno());
} }

2
js/src/jit/MIR.cpp
View File

@ -1166,7 +1166,7 @@ MConstant::printOpcode(GenericPrinter& out) const
} }
if (fun->hasScript()) { if (fun->hasScript()) {
JSScript* script = fun->nonLazyScript(); JSScript* script = fun->nonLazyScript();
out.printf(" (%s:%zu)", out.printf(" (%s:%u)",
script->filename() ? script->filename() : "", script->lineno()); script->filename() ? script->filename() : "", script->lineno());
} }
out.printf(" at %p", (void*) fun); out.printf(" at %p", (void*) fun);

2
js/src/jit/RematerializedFrame.cpp
View File

@ -172,7 +172,7 @@ RematerializedFrame::dump()
fprintf(stderr, " global frame, no callee\n"); fprintf(stderr, " global frame, no callee\n");
} }
fprintf(stderr, " file %s line %zu offset %zu\n", fprintf(stderr, " file %s line %u offset %zu\n",
script()->filename(), script()->lineno(), script()->filename(), script()->lineno(),
script()->pcToOffset(pc())); script()->pcToOffset(pc()));

4
js/src/jit/SharedIC.cpp
View File

@ -51,7 +51,7 @@ FallbackICSpew(JSContext* cx, ICFallbackStub* stub, const char* fmt, ...)
va_end(args); va_end(args);
JitSpew(JitSpew_BaselineICFallback, JitSpew(JitSpew_BaselineICFallback,
"Fallback hit for (%s:%zu) (pc=%zu,line=%d,uses=%d,stubs=%zu): %s", "Fallback hit for (%s:%u) (pc=%zu,line=%d,uses=%d,stubs=%zu): %s",
script->filename(), script->filename(),
script->lineno(), script->lineno(),
script->pcToOffset(pc), script->pcToOffset(pc),
@ -76,7 +76,7 @@ TypeFallbackICSpew(JSContext* cx, ICTypeMonitor_Fallback* stub, const char* fmt,
va_end(args); va_end(args);
JitSpew(JitSpew_BaselineICFallback, JitSpew(JitSpew_BaselineICFallback,
"Type monitor fallback hit for (%s:%zu) (pc=%zu,line=%d,uses=%d,stubs=%d): %s", "Type monitor fallback hit for (%s:%u) (pc=%zu,line=%d,uses=%d,stubs=%d): %s",
script->filename(), script->filename(),
script->lineno(), script->lineno(),
script->pcToOffset(pc), script->pcToOffset(pc),

6
js/src/jit/shared/CodeGenerator-shared.cpp
View File

@ -284,7 +284,7 @@ CodeGeneratorShared::dumpNativeToBytecodeEntries()
{ {
#ifdef JS_JITSPEW #ifdef JS_JITSPEW
InlineScriptTree* topTree = gen->info().inlineScriptTree(); InlineScriptTree* topTree = gen->info().inlineScriptTree();
JitSpewStart(JitSpew_Profiling, "Native To Bytecode Entries for %s:%zu\n", JitSpewStart(JitSpew_Profiling, "Native To Bytecode Entries for %s:%u\n",
topTree->script()->filename(), topTree->script()->lineno()); topTree->script()->filename(), topTree->script()->lineno());
for (unsigned i = 0; i < nativeToBytecodeList_.length(); i++) for (unsigned i = 0; i < nativeToBytecodeList_.length(); i++)
dumpNativeToBytecodeEntry(i); dumpNativeToBytecodeEntry(i);
@ -307,7 +307,7 @@ CodeGeneratorShared::dumpNativeToBytecodeEntry(uint32_t idx)
if (nextRef->tree == ref.tree) if (nextRef->tree == ref.tree)
pcDelta = nextRef->pc - ref.pc; pcDelta = nextRef->pc - ref.pc;
} }
JitSpewStart(JitSpew_Profiling, " %08zx [+%-6d] => %-6ld [%-4d] {%-10s} (%s:%zu", JitSpewStart(JitSpew_Profiling, " %08zx [+%-6d] => %-6ld [%-4d] {%-10s} (%s:%u",
ref.nativeOffset.offset(), ref.nativeOffset.offset(),
nativeDelta, nativeDelta,
(long) (ref.pc - script->code()), (long) (ref.pc - script->code()),
@ -316,7 +316,7 @@ CodeGeneratorShared::dumpNativeToBytecodeEntry(uint32_t idx)
script->filename(), script->lineno()); script->filename(), script->lineno());
for (tree = tree->caller(); tree; tree = tree->caller()) { for (tree = tree->caller(); tree; tree = tree->caller()) {
JitSpewCont(JitSpew_Profiling, " <= %s:%zu", tree->script()->filename(), JitSpewCont(JitSpew_Profiling, " <= %s:%u", tree->script()->filename(),
tree->script()->lineno()); tree->script()->lineno());
} }
JitSpewCont(JitSpew_Profiling, ")"); JitSpewCont(JitSpew_Profiling, ")");

2
js/src/shell/js.cpp
View File

@ -6177,7 +6177,7 @@ ReflectTrackedOptimizations(JSContext* cx, unsigned argc, Value* vp)
uint8_t* addr = ion->method()->raw() + endOffset; uint8_t* addr = ion->method()->raw() + endOffset;
entry.youngestFrameLocationAtAddr(rt, addr, &script, &pc); entry.youngestFrameLocationAtAddr(rt, addr, &script, &pc);
if (!sp.jsprintf("{\"location\":\"%s:%zu\",\"offset\":%zu,\"index\":%u}%s", if (!sp.jsprintf("{\"location\":\"%s:%u\",\"offset\":%zu,\"index\":%u}%s",
script->filename(), script->lineno(), script->pcToOffset(pc), index, script->filename(), script->lineno(), script->pcToOffset(pc), index,
iter.more() ? "," : "")) iter.more() ? "," : ""))
{ {

4
js/src/vm/BytecodeUtil.cpp
View File

@ -209,11 +209,11 @@ js::DumpCompartmentPCCounts(JSContext* cx)
if (!sprinter.init()) if (!sprinter.init())
return false; return false;
fprintf(stdout, "--- SCRIPT %s:%zu ---\n", script->filename(), script->lineno()); fprintf(stdout, "--- SCRIPT %s:%u ---\n", script->filename(), script->lineno());
if (!DumpPCCounts(cx, script, &sprinter)) if (!DumpPCCounts(cx, script, &sprinter))
return false; return false;
fputs(sprinter.string(), stdout); fputs(sprinter.string(), stdout);
fprintf(stdout, "--- END SCRIPT %s:%zu ---\n", script->filename(), script->lineno()); fprintf(stdout, "--- END SCRIPT %s:%u ---\n", script->filename(), script->lineno());
} }
return true; return true;

2
js/src/vm/CodeCoverage.cpp
View File

@ -150,7 +150,7 @@ LCovSource::writeScript(JSScript* script)
return false; return false;
numFunctionsFound_++; numFunctionsFound_++;
outFN_.printf("FN:%zu,", script->lineno()); outFN_.printf("FN:%u,", script->lineno());
if (!writeScriptName(outFN_, script)) if (!writeScriptName(outFN_, script))
return false; return false;
outFN_.put("\n", 1); outFN_.put("\n", 1);

4
js/src/vm/Debugger.cpp
View File

@ -375,7 +375,7 @@ class MOZ_RAII js::EnterDebuggeeNoExecute
} }
const char* filename = script->filename() ? script->filename() : "(none)"; const char* filename = script->filename() ? script->filename() : "(none)";
char linenoStr[15]; char linenoStr[15];
SprintfLiteral(linenoStr, "%zu", script->lineno()); SprintfLiteral(linenoStr, "%u", script->lineno());
unsigned flags = warning ? JSREPORT_WARNING : JSREPORT_ERROR; unsigned flags = warning ? JSREPORT_WARNING : JSREPORT_ERROR;
// FIXME: filename should be UTF-8 (bug 987069). // FIXME: filename should be UTF-8 (bug 987069).
return JS_ReportErrorFlagsAndNumberLatin1(cx, flags, GetErrorMessage, nullptr, return JS_ReportErrorFlagsAndNumberLatin1(cx, flags, GetErrorMessage, nullptr,
@ -5416,7 +5416,7 @@ struct DebuggerScriptGetStartLineMatcher
using ReturnType = uint32_t; using ReturnType = uint32_t;
ReturnType match(HandleScript script) { ReturnType match(HandleScript script) {
return uint32_t(script->lineno()); return script->lineno();
} }
ReturnType match(Handle<WasmInstanceObject*> wasmInstance) { ReturnType match(Handle<WasmInstanceObject*> wasmInstance) {
return 1; return 1;

4
js/src/vm/EnvironmentObject.cpp
View File

@ -3712,14 +3712,14 @@ AnalyzeEntrainedVariablesInScript(JSContext* cx, HandleScript script, HandleScri
buf.printf(" "); buf.printf(" ");
} }
buf.printf("(%s:%zu) has variables entrained by ", script->filename(), script->lineno()); buf.printf("(%s:%u) has variables entrained by ", script->filename(), script->lineno());
if (JSAtom* name = innerScript->functionNonDelazifying()->displayAtom()) { if (JSAtom* name = innerScript->functionNonDelazifying()->displayAtom()) {
buf.putString(name); buf.putString(name);
buf.printf(" "); buf.printf(" ");
} }
buf.printf("(%s:%zu) ::", innerScript->filename(), innerScript->lineno()); buf.printf("(%s:%u) ::", innerScript->filename(), innerScript->lineno());
for (PropertyNameSet::Range r = remainingNames.all(); !r.empty(); r.popFront()) { for (PropertyNameSet::Range r = remainingNames.all(); !r.empty(); r.popFront()) {
buf.printf(" "); buf.printf(" ");

4
js/src/vm/JSObject.cpp
View File

@ -3437,7 +3437,7 @@ dumpValue(const Value& v, js::GenericPrinter& out)
} }
if (fun->hasScript()) { if (fun->hasScript()) {
JSScript* script = fun->nonLazyScript(); JSScript* script = fun->nonLazyScript();
out.printf(" (%s:%zu)", out.printf(" (%s:%u)",
script->filename() ? script->filename() : "", script->lineno()); script->filename() ? script->filename() : "", script->lineno());
} }
out.printf(" at %p>", (void*) fun); out.printf(" at %p>", (void*) fun);
@ -3717,7 +3717,7 @@ js::DumpInterpreterFrame(JSContext* cx, js::GenericPrinter& out, InterpreterFram
} }
out.putChar('\n'); out.putChar('\n');
out.printf("file %s line %zu\n", out.printf("file %s line %u\n",
i.script()->filename(), i.script()->lineno()); i.script()->filename(), i.script()->lineno());
if (jsbytecode* pc = i.pc()) { if (jsbytecode* pc = i.pc()) {

4
js/src/vm/JSScript.h
View File

@ -1295,11 +1295,11 @@ class JSScript : public js::gc::TenuredCell
return mainOffset_; return mainOffset_;
} }
size_t lineno() const { uint32_t lineno() const {
return lineno_; return lineno_;
} }
size_t column() const { uint32_t column() const {
return column_; return column_;
} }

4
js/src/vm/TypeInference.cpp
View File

@ -2574,7 +2574,7 @@ TypeZone::processPendingRecompiles(FreeOp* fop, RecompileInfoVector& recompiles)
void void
TypeZone::addPendingRecompile(JSContext* cx, const RecompileInfo& info) TypeZone::addPendingRecompile(JSContext* cx, const RecompileInfo& info)
{ {
InferSpew(ISpewOps, "addPendingRecompile: %p:%s:%zu", InferSpew(ISpewOps, "addPendingRecompile: %p:%s:%u",
info.script(), info.script()->filename(), info.script()->lineno()); info.script(), info.script()->filename(), info.script()->lineno());
AutoEnterOOMUnsafeRegion oomUnsafe; AutoEnterOOMUnsafeRegion oomUnsafe;
@ -4700,7 +4700,7 @@ TypeScript::printTypes(JSContext* cx, HandleScript script) const
fprintf(stderr, "Eval"); fprintf(stderr, "Eval");
else else
fprintf(stderr, "Main"); fprintf(stderr, "Main");
fprintf(stderr, " %#" PRIxPTR " %s:%zu ", fprintf(stderr, " %#" PRIxPTR " %s:%u ",
uintptr_t(script.get()), script->filename(), script->lineno()); uintptr_t(script.get()), script->filename(), script->lineno());
if (script->functionNonDelazifying()) { if (script->functionNonDelazifying()) {

2
js/src/vtune/VTuneWrapper.cpp
View File

@ -133,7 +133,7 @@ MarkScript(const js::jit::JitCode* code, const JSScript* script, const char* mod
// Line numbers begin at 1, but columns begin at 0. // Line numbers begin at 1, but columns begin at 0.
// Text editors start at 1,1 so fixup is performed to match. // Text editors start at 1,1 so fixup is performed to match.
char namebuf[512]; char namebuf[512];
SprintfLiteral(namebuf, "%s:%zu:%zu", SprintfLiteral(namebuf, "%s:%u:%u",
script->filename(), script->lineno(), script->column() + 1); script->filename(), script->lineno(), script->column() + 1);
method.method_name = &namebuf[0]; method.method_name = &namebuf[0];