/js/src/frontend/Stencil.cpp and one more file have been updated (aeafc420)

[github-actions[bot]]

Files

• /js/src/frontend/Stencil.cpp
• /js/src/vm/BytecodeUtil.cpp

Changesets

• https://hg.mozilla.org/mozilla-central/rev/aeafc420949ca9fe37744dbce5b4cb4ce4975010 Bug 1862814 - Part 2: Use 1-origin column number in script-related dump. r=iain
• https://hg.mozilla.org/mozilla-central/rev/275cd8d44829f57197d7d70055f5a88bf890d153 Backed out 14 changesets (bug 1865005, bug 1864168, bug 1864155, bug 1862814, bug 1862693) for causing bustage on nsRFPService.cpp. CLOSED TREE
• https://hg.mozilla.org/mozilla-central/rev/1378502e64b0a462f06e2e4ed59d4bb0d2b31476 Bug 1862814 - Part 2: Use 1-origin column number in script-related dump. r=iain

Diffs

/js/src/frontend/Stencil.cpp

--- 750908d92ab10765bbf1d6c8674a698f90ee5e6d/js/src/frontend/Stencil.cpp
+++ aeafc420949ca9fe37744dbce5b4cb4ce4975010/js/src/frontend/Stencil.cpp
@@ -4423,17 +4423,17 @@ void ScriptStencilExtra::dumpFields(js::
   json.endList();

   json.beginObjectProperty("extent");
   json.property("sourceStart", extent.sourceStart);
   json.property("sourceEnd", extent.sourceEnd);
   json.property("toStringStart", extent.toStringStart);
   json.property("toStringEnd", extent.toStringEnd);
   json.property("lineno", extent.lineno);
-  json.property("column", extent.column.zeroOriginValue());
+  json.property("column", extent.column.oneOriginValue());
   json.endObject();

   json.property("memberInitializers", memberInitializers_);

   json.property("nargs", nargs);
 }

 void SharedDataContainer::dump() const {
@@ -4586,17 +4586,17 @@ static void DumpInputScriptFields(js::JS
   json.beginObjectProperty("extent");
   {
     SourceExtent extent = script.extent();
     json.property("sourceStart", extent.sourceStart);
     json.property("sourceEnd", extent.sourceEnd);
     json.property("toStringStart", extent.toStringStart);
     json.property("toStringEnd", extent.toStringEnd);
     json.property("lineno", extent.lineno);
-    json.property("column", extent.column.zeroOriginValue());
+    json.property("column", extent.column.oneOriginValue());
   }
   json.endObject();

   json.beginListProperty("immutableFlags");
   DumpImmutableScriptFlags(json, script.immutableFlags());
   json.endList();

   json.beginListProperty("functionFlags");

/js/src/vm/BytecodeUtil.cpp

--- d04f0010a047a3bae14a0bced1deb16a813b3132/js/src/vm/BytecodeUtil.cpp
+++ aeafc420949ca9fe37744dbce5b4cb4ce4975010/js/src/vm/BytecodeUtil.cpp
@@ -109,17 +109,17 @@ static bool DecompileArgumentFromStack(J

   for (size_t i = 0; i < ionCounts->numBlocks(); i++) {
     const jit::IonBlockCounts& block = ionCounts->block(i);
     unsigned lineNumber = 0;
     JS::LimitedColumnNumberOneOrigin columnNumber;
     lineNumber = PCToLineNumber(script, script->offsetToPC(block.offset()),
                                 &columnNumber);
     sp->printf("BB #%" PRIu32 " [%05u,%u,%u]", block.id(), block.offset(),
-               lineNumber, columnNumber.zeroOriginValue());
+               lineNumber, columnNumber.oneOriginValue());
     if (block.description()) {
       sp->printf(" [inlined %s]", block.description());
     }
     for (size_t j = 0; j < block.numSuccessors(); j++) {
       sp->printf(" -> #%" PRIu32, block.successor(j));
     }
     sp->printf(" :: %" PRIu64 " hits\n", block.hitCount());
     sp->printf("%s\n", block.code());