Bug 1862692 - Part 2: Use 1-origin column number types in wasm debug. r=iain

Differential Revision: https://phabricator.services.mozilla.com/D193015

js/src/debugger/Script.cpp

@@ -1040,7 +1040,7 @@ class DebuggerScript::GetOffsetMetadataMatcher {
     }
 
     uint32_t lineno;
-    JS::LimitedColumnNumberZeroOrigin column;
+    JS::LimitedColumnNumberOneOrigin column;
     if (!instance.debug().getOffsetLocation(offset_, &lineno, &column)) {
       JS_ReportErrorNumberASCII(cx_, GetErrorMessage, nullptr,
                                 JSMSG_DEBUG_BAD_OFFSET);
@@ -1057,7 +1057,7 @@ class DebuggerScript::GetOffsetMetadataMatcher {
       return false;
     }
 
-    value = NumberValue(column.zeroOriginValue());
+    value = NumberValue(column.oneOriginValue());
     if (!DefineDataProperty(cx_, result_, cx_->names().columnNumber, value)) {
       return false;
     }
@@ -1362,7 +1362,7 @@ class DebuggerScript::GetOffsetLocationMatcher {
     }
 
     uint32_t lineno;
-    JS::LimitedColumnNumberZeroOrigin column;
+    JS::LimitedColumnNumberOneOrigin column;
     if (!instance.debug().getOffsetLocation(offset_, &lineno, &column)) {
       JS_ReportErrorNumberASCII(cx_, GetErrorMessage, nullptr,
                                 JSMSG_DEBUG_BAD_OFFSET);
@@ -1379,7 +1379,7 @@ class DebuggerScript::GetOffsetLocationMatcher {
       return false;
     }
 
-    value = NumberValue(column.zeroOriginValue());
+    value = NumberValue(column.oneOriginValue());
     if (!DefineDataProperty(cx_, result_, cx_->names().columnNumber, value)) {
       return false;
     }

js/src/wasm/WasmDebug.cpp

@@ -94,12 +94,12 @@ bool DebugState::getAllColumnOffsets(Vector<ExprLoc>* offsets) {
 }
 
 bool DebugState::getOffsetLocation(uint32_t offset, uint32_t* lineno,
-                                   JS::LimitedColumnNumberZeroOrigin* column) {
+                                   JS::LimitedColumnNumberOneOrigin* column) {
   if (!SlowCallSiteSearchByOffset(metadata(Tier::Debug), offset)) {
     return false;
   }
   *lineno = offset;
-  *column = JS::LimitedColumnNumberZeroOrigin(
+  *column = JS::LimitedColumnNumberOneOrigin(
       JS::WasmFunctionIndex::DefaultBinarySourceColumnNumberOneOrigin);
   return true;
 }

js/src/wasm/WasmDebug.h

@@ -19,7 +19,7 @@
 #ifndef wasm_debug_h
 #define wasm_debug_h
 
-#include "js/ColumnNumber.h"  // JS::LimitedColumnNumberZeroOrigin
+#include "js/ColumnNumber.h"  // JS::LimitedColumnNumberOneOrigin
 #include "js/HashTable.h"
 #include "wasm/WasmCode.h"
 #include "wasm/WasmCodegenTypes.h"
@@ -109,7 +109,7 @@ class DebugState {
   [[nodiscard]] bool getAllColumnOffsets(Vector<ExprLoc>* offsets);
   [[nodiscard]] bool getOffsetLocation(
       uint32_t offset, uint32_t* lineno,
-      JS::LimitedColumnNumberZeroOrigin* column);
+      JS::LimitedColumnNumberOneOrigin* column);
 
   // The Code can track enter/leave frame events. Any such event triggers
   // debug trap. The enter/leave frame events enabled or disabled across