From f431bdeaf24a3aed5181c431ca9568f2a97a76b1 Mon Sep 17 00:00:00 2001 From: maharsh312 Date: Sun, 27 May 2018 04:00:06 +0530 Subject: [PATCH] Bug 1464321 - Changed return type of two methods in JSScript with relative format string change. r=arai --- js/src/gc/Tracer.cpp | 2 +- js/src/jit/BaselineBailouts.cpp | 20 ++++++++++---------- js/src/jit/BaselineCompiler.cpp | 8 ++++---- js/src/jit/BaselineDebugModeOSR.cpp | 6 +++--- js/src/jit/BaselineIC.cpp | 2 +- js/src/jit/C1Spewer.cpp | 4 ++-- js/src/jit/CodeGenerator.cpp | 4 ++-- js/src/jit/Ion.cpp | 14 +++++++------- js/src/jit/IonBuilder.cpp | 14 +++++++------- js/src/jit/IonIC.cpp | 2 +- js/src/jit/JSJitFrameIter.cpp | 6 +++--- js/src/jit/JSONSpewer.cpp | 2 +- js/src/jit/JitFrames.cpp | 2 +- js/src/jit/JitcodeMap.cpp | 6 +++--- js/src/jit/MIR.cpp | 2 +- js/src/jit/RematerializedFrame.cpp | 2 +- js/src/jit/SharedIC.cpp | 4 ++-- js/src/jit/shared/CodeGenerator-shared.cpp | 6 +++--- js/src/shell/js.cpp | 2 +- js/src/vm/BytecodeUtil.cpp | 4 ++-- js/src/vm/CodeCoverage.cpp | 2 +- js/src/vm/Debugger.cpp | 4 ++-- js/src/vm/EnvironmentObject.cpp | 4 ++-- js/src/vm/JSObject.cpp | 4 ++-- js/src/vm/JSScript.h | 4 ++-- js/src/vm/TypeInference.cpp | 4 ++-- js/src/vtune/VTuneWrapper.cpp | 2 +- 27 files changed, 68 insertions(+), 68 deletions(-) diff --git a/js/src/gc/Tracer.cpp b/js/src/gc/Tracer.cpp index b339237007e7..7cc895900f7e 100644 --- a/js/src/gc/Tracer.cpp +++ b/js/src/gc/Tracer.cpp @@ -441,7 +441,7 @@ JS_GetTraceThingInfo(char* buf, size_t bufsize, JSTracer* trc, void* thing, case JS::TraceKind::Script: { JSScript* script = static_cast(thing); - snprintf(buf, bufsize, " %s:%zu", script->filename(), script->lineno()); + snprintf(buf, bufsize, " %s:%u", script->filename(), script->lineno()); break; } diff --git a/js/src/jit/BaselineBailouts.cpp b/js/src/jit/BaselineBailouts.cpp index 201cf0115f65..7f4844f668ae 100644 --- a/js/src/jit/BaselineBailouts.cpp +++ b/js/src/jit/BaselineBailouts.cpp @@ -678,7 +678,7 @@ InitFromBailout(JSContext* cx, size_t frameNo, // | 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]"); // Calculate and write the previous frame pointer value. @@ -1065,7 +1065,7 @@ InitFromBailout(JSContext* cx, size_t frameNo, #endif #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], PCToLineNumber(script, pc), script->filename(), script->lineno()); JitSpew(JitSpew_BaselineBailouts, " Bailout kind: %s", @@ -1241,7 +1241,7 @@ InitFromBailout(JSContext* cx, size_t frameNo, ReportOutOfMemory(cx); 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), resumeAfter ? "after" : "at", 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(), (int) prevFrameType); @@ -1613,7 +1613,7 @@ jit::BailoutIonToBaseline(JSContext* cx, JitActivation* activation, RootedFunction callee(cx, iter.maybeCallee()); RootedScript scr(cx, iter.script()); if (callee) { - JitSpew(JitSpew_BaselineBailouts, " Callee function (%s:%zu)", + JitSpew(JitSpew_BaselineBailouts, " Callee function (%s:%u)", scr->filename(), scr->lineno()); } else { JitSpew(JitSpew_BaselineBailouts, " No callee!"); @@ -1739,7 +1739,7 @@ InvalidateAfterBailout(JSContext* cx, HandleScript outerScript, const char* reas static void 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(), outerScript->filename(), outerScript->lineno()); @@ -1754,7 +1754,7 @@ HandleBoundsCheckFailure(JSContext* cx, HandleScript outerScript, HandleScript i static void 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(), outerScript->filename(), outerScript->lineno()); @@ -1769,7 +1769,7 @@ HandleShapeGuardFailure(JSContext* cx, HandleScript outerScript, HandleScript in static void 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(), outerScript->filename(), outerScript->lineno()); @@ -1779,7 +1779,7 @@ HandleBaselineInfoBailout(JSContext* cx, HandleScript outerScript, HandleScript static void 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(), outerScript->filename(), outerScript->lineno()); @@ -1982,7 +1982,7 @@ jit::FinishBailoutToBaseline(BaselineBailoutInfo* bailoutInfo) } 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(), innerScript->filename(), innerScript->lineno(), innerScript->getWarmUpCount(), (unsigned) bailoutKind); diff --git a/js/src/jit/BaselineCompiler.cpp b/js/src/jit/BaselineCompiler.cpp index d51ebfbdeaf8..0e33ebd5346c 100644 --- a/js/src/jit/BaselineCompiler.cpp +++ b/js/src/jit/BaselineCompiler.cpp @@ -86,10 +86,10 @@ BaselineCompiler::addPCMappingEntry(bool addIndexEntry) MethodStatus 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); - JitSpew(JitSpew_Codegen, "# Emitting baseline code for script %s:%zu", + JitSpew(JitSpew_Codegen, "# Emitting baseline code for script %s:%u", script->filename(), script->lineno()); TraceLoggerThread* logger = TraceLoggerForCurrentThread(cx); @@ -222,7 +222,7 @@ BaselineCompiler::compile() baselineScript->setMethod(code); 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(), script->filename(), script->lineno()); @@ -278,7 +278,7 @@ BaselineCompiler::compile() // Always register a native => bytecode mapping entry, since profiler can be // 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()); // Generate profiling string. diff --git a/js/src/jit/BaselineDebugModeOSR.cpp b/js/src/jit/BaselineDebugModeOSR.cpp index 707b6f943ecf..f51c0fb4e3ef 100644 --- a/js/src/jit/BaselineDebugModeOSR.cpp +++ b/js/src/jit/BaselineDebugModeOSR.cpp @@ -320,7 +320,7 @@ SpewPatchBaselineFrame(uint8_t* oldReturnAddress, uint8_t* newReturnAddress, JSScript* script, ICEntry::Kind frameKind, jsbytecode* pc) { 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(), ICEntryKindToString(frameKind), CodeName[(JSOp)*pc]); } @@ -330,7 +330,7 @@ SpewPatchBaselineFrameFromExceptionHandler(uint8_t* oldReturnAddress, uint8_t* n JSScript* script, jsbytecode* pc) { 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(), CodeName[(JSOp)*pc]); } @@ -667,7 +667,7 @@ RecompileBaselineScriptForDebugMode(JSContext* cx, JSScript* script, if (oldBaselineScript->hasDebugInstrumentation() == observing) 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"); AutoKeepTypeScripts keepTypes(cx); diff --git a/js/src/jit/BaselineIC.cpp b/js/src/jit/BaselineIC.cpp index e9ad0fc2565c..d19bbff22b62 100644 --- a/js/src/jit/BaselineIC.cpp +++ b/js/src/jit/BaselineIC.cpp @@ -2105,7 +2105,7 @@ TryAttachCallStub(JSContext* cx, ICCall_Fallback* stub, HandleScript script, jsb fun->native(), constructing ? "yes" : "no", isSpread ? "yes" : "no"); } else { 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(), constructing ? "yes" : "no", isSpread ? "yes" : "no"); } diff --git a/js/src/jit/C1Spewer.cpp b/js/src/jit/C1Spewer.cpp index 4b6041c71c62..038d9c5b18eb 100644 --- a/js/src/jit/C1Spewer.cpp +++ b/js/src/jit/C1Spewer.cpp @@ -27,8 +27,8 @@ C1Spewer::beginFunction(MIRGraph* graph, JSScript* script) out_.printf("begin_compilation\n"); if (script) { - out_.printf(" name \"%s:%zu\"\n", script->filename(), script->lineno()); - out_.printf(" method \"%s:%zu\"\n", script->filename(), script->lineno()); + out_.printf(" name \"%s:%u\"\n", script->filename(), script->lineno()); + out_.printf(" method \"%s:%u\"\n", script->filename(), script->lineno()); } else { out_.printf(" name \"wasm compilation\"\n"); out_.printf(" method \"wasm compilation\"\n"); diff --git a/js/src/jit/CodeGenerator.cpp b/js/src/jit/CodeGenerator.cpp index 0aa8da46c47f..009b709131de 100644 --- a/js/src/jit/CodeGenerator.cpp +++ b/js/src/jit/CodeGenerator.cpp @@ -5357,7 +5357,7 @@ CodeGenerator::maybeCreateScriptCounts() JSScript* innerScript = block->info().script(); description = (char*) js_calloc(200); if (description) { - snprintf(description, 200, "%s:%zu", + snprintf(description, 200, "%s:%u", innerScript->filename(), innerScript->lineno()); } } @@ -10145,7 +10145,7 @@ CodeGenerator::generateWasm(wasm::SigIdDesc sigId, wasm::BytecodeOffset trapOffs bool 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()->lineno()); diff --git a/js/src/jit/Ion.cpp b/js/src/jit/Ion.cpp index d26c8e32826d..08f7ae436d46 100644 --- a/js/src/jit/Ion.cpp +++ b/js/src/jit/Ion.cpp @@ -2159,7 +2159,7 @@ IonCompile(JSContext* cx, JSScript* script, // If possible, compile the script off thread. 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.)", builderScript->filename(), builderScript->lineno()); @@ -2355,7 +2355,7 @@ Compile(JSContext* cx, HandleScript script, BaselineFrame* osrFrame, jsbytecode* } 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; } @@ -2625,7 +2625,7 @@ jit::IonCompileScriptForBaseline(JSContext* cx, BaselineFrame* frame, jsbytecode // Ensure that Ion-compiled code is available. 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); MethodStatus stat; @@ -2729,7 +2729,7 @@ InvalidateActivation(FreeOp* fop, const JitActivationIterator& activations, bool else if (frame.isBailoutJS()) type = "Bailing"; 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(), frame.script()->lineno(), frame.maybeCallee(), (JSScript*)frame.script(), frame.returnAddressToFp()); @@ -2887,7 +2887,7 @@ jit::Invalidate(TypeZone& types, FreeOp* fop, if (!ionScript) continue; - JitSpew(JitSpew_IonInvalidate, " Invalidate %s:%zu, IonScript %p", + JitSpew(JitSpew_IonInvalidate, " Invalidate %s:%u, IonScript %p", info.script()->filename(), info.script()->lineno(), ionScript); // 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 = ""; // 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. if (buf) { @@ -3015,7 +3015,7 @@ jit::FinishInvalidation(FreeOp* fop, JSScript* script) void 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()); CancelOffThreadIonCompile(script); diff --git a/js/src/jit/IonBuilder.cpp b/js/src/jit/IonBuilder.cpp index 871a817dfb1b..b9ec12bc8e22 100644 --- a/js/src/jit/IonBuilder.cpp +++ b/js/src/jit/IonBuilder.cpp @@ -325,7 +325,7 @@ IonBuilder::InliningDecision IonBuilder::DontInline(JSScript* targetScript, const char* reason) { if (targetScript) { - JitSpew(JitSpew_Inlining, "Cannot inline %s:%zu: %s", + JitSpew(JitSpew_Inlining, "Cannot inline %s:%u: %s", targetScript->filename(), targetScript->lineno(), reason); } else { JitSpew(JitSpew_Inlining, "Cannot inline: %s", reason); @@ -751,11 +751,11 @@ IonBuilder::build() #ifdef JS_JITSPEW 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(), AnalysisModeString(info().analysisMode())); } 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()->filename(), script()->lineno(), (void*)script(), script()->getWarmUpCount(), OptimizationLevelString(optimizationInfo().level())); @@ -925,7 +925,7 @@ IonBuilder::buildInline(IonBuilder* callerBuilder, MResumePoint* callerResumePoi 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()); callerBuilder_ = callerBuilder; @@ -1214,7 +1214,7 @@ IonBuilder::initEnvironmentChain(MDefinition* callee) void 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); MOZ_ASSERT(info().needsArgsObj()); @@ -1426,7 +1426,7 @@ GetOrCreateControlFlowGraph(TempAllocator& tempAlloc, JSScript* script, } if (JitSpewEnabled(JitSpew_CFG)) { - JitSpew(JitSpew_CFG, "Generating graph for %s:%zu", + JitSpew(JitSpew_CFG, "Generating graph for %s:%u", script->filename(), script->lineno()); Fprinter& print = JitSpewPrinter(); cfg->dump(print, script); @@ -4028,7 +4028,7 @@ IonBuilder::makeInliningDecision(JSObject* targetArg, CallInfo& callInfo) info().analysisMode() != Analysis_DefiniteProperties) { 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()); return InliningDecision_WarmUpCountTooLow; } diff --git a/js/src/jit/IonIC.cpp b/js/src/jit/IonIC.cpp index cd06320356ff..cc12e682610b 100644 --- a/js/src/jit/IonIC.cpp +++ b/js/src/jit/IonIC.cpp @@ -158,7 +158,7 @@ IonGetPropertyIC::update(JSContext* cx, HandleScript outerScript, IonGetProperty // 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 // 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->setInvalidatedIdempotentCache(); diff --git a/js/src/jit/JSJitFrameIter.cpp b/js/src/jit/JSJitFrameIter.cpp index 63a33d3d7762..5cb377f3aabd 100644 --- a/js/src/jit/JSJitFrameIter.cpp +++ b/js/src/jit/JSJitFrameIter.cpp @@ -314,7 +314,7 @@ JSJitFrameIter::dumpBaseline() const 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()); JSContext* cx = TlsContext.get(); @@ -431,7 +431,7 @@ JSJitFrameIter::verifyReturnAddressUsingNativeToBytecodeMap() JitSpew(JitSpew_Profiling, "Found bytecode location of depth %d:", depth); 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(), size_t(location[i].pc - location[i].script->code())); } @@ -444,7 +444,7 @@ JSJitFrameIter::verifyReturnAddressUsingNativeToBytecodeMap() MOZ_ASSERT_IF(idx < location.length() - 1, inlineFrames.more()); 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, inlineFrames.script()->filename(), inlineFrames.script()->lineno(), diff --git a/js/src/jit/JSONSpewer.cpp b/js/src/jit/JSONSpewer.cpp index 2aaaaf49ddcf..e752e8f7ecef 100644 --- a/js/src/jit/JSONSpewer.cpp +++ b/js/src/jit/JSONSpewer.cpp @@ -25,7 +25,7 @@ JSONSpewer::beginFunction(JSScript* script) { beginObject(); if (script) - formatProperty("name", "%s:%zu", script->filename(), script->lineno()); + formatProperty("name", "%s:%u", script->filename(), script->lineno()); else property("name", "wasm compilation"); beginListProperty("passes"); diff --git a/js/src/jit/JitFrames.cpp b/js/src/jit/JitFrames.cpp index 307f36c049e0..a641ebed269e 100644 --- a/js/src/jit/JitFrames.cpp +++ b/js/src/jit/JitFrames.cpp @@ -2354,7 +2354,7 @@ InlineFrameIterator::dump() const 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()); fprintf(stderr, " script = %p, pc = %p\n", (void*) script(), pc()); diff --git a/js/src/jit/JitcodeMap.cpp b/js/src/jit/JitcodeMap.cpp index b72354f6dbe0..74b25ad5cf9c 100644 --- a/js/src/jit/JitcodeMap.cpp +++ b/js/src/jit/JitcodeMap.cpp @@ -328,7 +328,7 @@ JitcodeGlobalEntry::createScriptString(JSContext* cx, JSScript* script, size_t* size_t linenoLength = 0; char linenoStr[15]; if (hasName || (script->functionNonDelazifying() || script->isForEval())) { - linenoLength = SprintfLiteral(linenoStr, "%zu", script->lineno()); + linenoLength = SprintfLiteral(linenoStr, "%u", script->lineno()); hasLineno = true; } @@ -1547,13 +1547,13 @@ JitcodeIonTable::WriteIonTable(CompactBufferWriter& writer, MOZ_ASSERT(writer.length() == 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(), mozilla::PointerRangeSize(start, end)); JitSpew(JitSpew_Profiling, " ScriptList of size %d", int(scriptListSize)); 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()); } diff --git a/js/src/jit/MIR.cpp b/js/src/jit/MIR.cpp index 64eeb1dff0a8..d2c13e2f9cfa 100644 --- a/js/src/jit/MIR.cpp +++ b/js/src/jit/MIR.cpp @@ -1166,7 +1166,7 @@ MConstant::printOpcode(GenericPrinter& out) const } if (fun->hasScript()) { JSScript* script = fun->nonLazyScript(); - out.printf(" (%s:%zu)", + out.printf(" (%s:%u)", script->filename() ? script->filename() : "", script->lineno()); } out.printf(" at %p", (void*) fun); diff --git a/js/src/jit/RematerializedFrame.cpp b/js/src/jit/RematerializedFrame.cpp index 8cfb0c0d0b87..696dd0507a3b 100644 --- a/js/src/jit/RematerializedFrame.cpp +++ b/js/src/jit/RematerializedFrame.cpp @@ -172,7 +172,7 @@ RematerializedFrame::dump() 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()->pcToOffset(pc())); diff --git a/js/src/jit/SharedIC.cpp b/js/src/jit/SharedIC.cpp index 10b4f72a5b5f..86cddffd77ac 100644 --- a/js/src/jit/SharedIC.cpp +++ b/js/src/jit/SharedIC.cpp @@ -51,7 +51,7 @@ FallbackICSpew(JSContext* cx, ICFallbackStub* stub, const char* fmt, ...) va_end(args); 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->lineno(), script->pcToOffset(pc), @@ -76,7 +76,7 @@ TypeFallbackICSpew(JSContext* cx, ICTypeMonitor_Fallback* stub, const char* fmt, va_end(args); 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->lineno(), script->pcToOffset(pc), diff --git a/js/src/jit/shared/CodeGenerator-shared.cpp b/js/src/jit/shared/CodeGenerator-shared.cpp index c4a85b3823c7..b8c9b83c1b3b 100644 --- a/js/src/jit/shared/CodeGenerator-shared.cpp +++ b/js/src/jit/shared/CodeGenerator-shared.cpp @@ -284,7 +284,7 @@ CodeGeneratorShared::dumpNativeToBytecodeEntries() { #ifdef JS_JITSPEW 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()); for (unsigned i = 0; i < nativeToBytecodeList_.length(); i++) dumpNativeToBytecodeEntry(i); @@ -307,7 +307,7 @@ CodeGeneratorShared::dumpNativeToBytecodeEntry(uint32_t idx) if (nextRef->tree == ref.tree) 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(), nativeDelta, (long) (ref.pc - script->code()), @@ -316,7 +316,7 @@ CodeGeneratorShared::dumpNativeToBytecodeEntry(uint32_t idx) script->filename(), script->lineno()); 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()); } JitSpewCont(JitSpew_Profiling, ")"); diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp index 662ac66bf05e..c3b09129d036 100644 --- a/js/src/shell/js.cpp +++ b/js/src/shell/js.cpp @@ -6177,7 +6177,7 @@ ReflectTrackedOptimizations(JSContext* cx, unsigned argc, Value* vp) uint8_t* addr = ion->method()->raw() + endOffset; 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, iter.more() ? "," : "")) { diff --git a/js/src/vm/BytecodeUtil.cpp b/js/src/vm/BytecodeUtil.cpp index ed9edf45e420..1eb740c78733 100644 --- a/js/src/vm/BytecodeUtil.cpp +++ b/js/src/vm/BytecodeUtil.cpp @@ -209,11 +209,11 @@ js::DumpCompartmentPCCounts(JSContext* cx) if (!sprinter.init()) 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)) return false; 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; diff --git a/js/src/vm/CodeCoverage.cpp b/js/src/vm/CodeCoverage.cpp index 04a1d6dbfdc4..5395fed8afa2 100644 --- a/js/src/vm/CodeCoverage.cpp +++ b/js/src/vm/CodeCoverage.cpp @@ -150,7 +150,7 @@ LCovSource::writeScript(JSScript* script) return false; numFunctionsFound_++; - outFN_.printf("FN:%zu,", script->lineno()); + outFN_.printf("FN:%u,", script->lineno()); if (!writeScriptName(outFN_, script)) return false; outFN_.put("\n", 1); diff --git a/js/src/vm/Debugger.cpp b/js/src/vm/Debugger.cpp index 9f00912832ae..049ac22ccb02 100644 --- a/js/src/vm/Debugger.cpp +++ b/js/src/vm/Debugger.cpp @@ -375,7 +375,7 @@ class MOZ_RAII js::EnterDebuggeeNoExecute } const char* filename = script->filename() ? script->filename() : "(none)"; char linenoStr[15]; - SprintfLiteral(linenoStr, "%zu", script->lineno()); + SprintfLiteral(linenoStr, "%u", script->lineno()); unsigned flags = warning ? JSREPORT_WARNING : JSREPORT_ERROR; // FIXME: filename should be UTF-8 (bug 987069). return JS_ReportErrorFlagsAndNumberLatin1(cx, flags, GetErrorMessage, nullptr, @@ -5416,7 +5416,7 @@ struct DebuggerScriptGetStartLineMatcher using ReturnType = uint32_t; ReturnType match(HandleScript script) { - return uint32_t(script->lineno()); + return script->lineno(); } ReturnType match(Handle wasmInstance) { return 1; diff --git a/js/src/vm/EnvironmentObject.cpp b/js/src/vm/EnvironmentObject.cpp index 09834a4be731..511d3580b87e 100644 --- a/js/src/vm/EnvironmentObject.cpp +++ b/js/src/vm/EnvironmentObject.cpp @@ -3712,14 +3712,14 @@ AnalyzeEntrainedVariablesInScript(JSContext* cx, HandleScript script, HandleScri 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()) { buf.putString(name); 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()) { buf.printf(" "); diff --git a/js/src/vm/JSObject.cpp b/js/src/vm/JSObject.cpp index 29e8491bc8fb..d21e860101fc 100644 --- a/js/src/vm/JSObject.cpp +++ b/js/src/vm/JSObject.cpp @@ -3437,7 +3437,7 @@ dumpValue(const Value& v, js::GenericPrinter& out) } if (fun->hasScript()) { JSScript* script = fun->nonLazyScript(); - out.printf(" (%s:%zu)", + out.printf(" (%s:%u)", script->filename() ? script->filename() : "", script->lineno()); } out.printf(" at %p>", (void*) fun); @@ -3717,7 +3717,7 @@ js::DumpInterpreterFrame(JSContext* cx, js::GenericPrinter& out, InterpreterFram } out.putChar('\n'); - out.printf("file %s line %zu\n", + out.printf("file %s line %u\n", i.script()->filename(), i.script()->lineno()); if (jsbytecode* pc = i.pc()) { diff --git a/js/src/vm/JSScript.h b/js/src/vm/JSScript.h index 0006ec0a3b71..75ef52e02034 100644 --- a/js/src/vm/JSScript.h +++ b/js/src/vm/JSScript.h @@ -1295,11 +1295,11 @@ class JSScript : public js::gc::TenuredCell return mainOffset_; } - size_t lineno() const { + uint32_t lineno() const { return lineno_; } - size_t column() const { + uint32_t column() const { return column_; } diff --git a/js/src/vm/TypeInference.cpp b/js/src/vm/TypeInference.cpp index 57fcd23aba04..4c2a33162ace 100644 --- a/js/src/vm/TypeInference.cpp +++ b/js/src/vm/TypeInference.cpp @@ -2574,7 +2574,7 @@ TypeZone::processPendingRecompiles(FreeOp* fop, RecompileInfoVector& recompiles) void 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()); AutoEnterOOMUnsafeRegion oomUnsafe; @@ -4700,7 +4700,7 @@ TypeScript::printTypes(JSContext* cx, HandleScript script) const fprintf(stderr, "Eval"); else fprintf(stderr, "Main"); - fprintf(stderr, " %#" PRIxPTR " %s:%zu ", + fprintf(stderr, " %#" PRIxPTR " %s:%u ", uintptr_t(script.get()), script->filename(), script->lineno()); if (script->functionNonDelazifying()) { diff --git a/js/src/vtune/VTuneWrapper.cpp b/js/src/vtune/VTuneWrapper.cpp index 6b86c1a350d7..3206d9edea87 100644 --- a/js/src/vtune/VTuneWrapper.cpp +++ b/js/src/vtune/VTuneWrapper.cpp @@ -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. // Text editors start at 1,1 so fixup is performed to match. char namebuf[512]; - SprintfLiteral(namebuf, "%s:%zu:%zu", + SprintfLiteral(namebuf, "%s:%u:%u", script->filename(), script->lineno(), script->column() + 1); method.method_name = &namebuf[0];