Bug 1847469 - Part 5: Use column number types in ErrorMetadata. r=iain

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

js/src/frontend/Frontend2.cpp

@@ -30,6 +30,7 @@
 #include "frontend/TokenStream.h"       // TokenStreamAnyChars
 #include "irregexp/RegExpAPI.h"         // irregexp::CheckPatternSyntax
 #include "js/CharacterEncoding.h"  // JS::UTF8Chars, UTF8CharsToNewTwoByteCharsZ, JS::ConstUTF8CharsZ
+#include "js/ColumnNumber.h"          // JS::ColumnNumberZeroOrigin
 #include "js/friend/ErrorMessages.h"  // js::GetErrorMessage, JSMSG_*
 #include "js/GCAPI.h"                 // JS::AutoCheckCannotGC
 #include "js/HeapAPI.h"               // JS::GCCellPtr
@@ -580,7 +581,7 @@ bool Smoosh::tryCompileGlobalScriptToExtensibleStencil(
     ErrorMetadata metadata;
     metadata.filename = JS::ConstUTF8CharsZ("<unknown>");
     metadata.lineNumber = 1;
-    metadata.columnNumber = 0;
+    metadata.columnNumber = JS::ColumnNumberZeroOrigin::zero();
     metadata.isMuted = false;
     ReportSmooshCompileError(cx, fc, std::move(metadata),
                              JSMSG_SMOOSH_COMPILE_ERROR,

js/src/frontend/TokenStream.cpp

@@ -1458,7 +1458,7 @@ void TokenStreamAnyChars::computeErrorMetadataNoOffset(
   err->isMuted = mutedErrors;
   err->filename = filename_;
   err->lineNumber = 0;
-  err->columnNumber = 0;
+  err->columnNumber = JS::ColumnNumberZeroOrigin::zero();
 
   MOZ_ASSERT(err->lineOfContext == nullptr);
 }
@@ -1477,7 +1477,9 @@ bool TokenStreamAnyChars::fillExceptingContext(ErrorMetadata* err,
                                maybeCx->realm()->principals());
       if (!iter.done() && iter.filename()) {
         err->filename = JS::ConstUTF8CharsZ(iter.filename());
-        err->lineNumber = iter.computeLine(&err->columnNumber);
+        uint32_t columnNumber;
+        err->lineNumber = iter.computeLine(&columnNumber);
+        err->columnNumber = JS::ColumnNumberZeroOrigin(columnNumber);
         return false;
       }
     }

js/src/frontend/TokenStream.h

@@ -2000,7 +2000,7 @@ class GeneralTokenStreamChars : public SpecializedTokenStreamCharsBase<Unit> {
     if (anyCharsAccess().fillExceptingContext(err, offset)) {
       JS::LimitedColumnNumberZeroOrigin columnNumber;
       computeLineAndColumn(offset, &err->lineNumber, &columnNumber);
-      err->columnNumber = columnNumber.zeroOriginValue();
+      err->columnNumber = JS::ColumnNumberZeroOrigin(columnNumber);
       return true;
     }
     return false;

js/src/irregexp/RegExpAPI.cpp

@@ -229,14 +229,14 @@ static void ReportSyntaxError(TokenStreamAnyChars& ts,
       // inside the literal.
       err.lineNumber = *line;
       auto offset = JS::ColumnNumberOffset(columnNumber.zeroOriginValue());
-      err.columnNumber = (*column + offset).zeroOriginValue();
+      err.columnNumber = *column + offset;
     } else {
       // Line breaks are not significant in pattern text in the same way as
       // in source text, so act as though pattern text is a single line, then
       // compute a column based on "code point" count (treating a lone
       // surrogate as a "code point" in UTF-16).  Gak.
       err.lineNumber = 1;
-      err.columnNumber = columnNumber.zeroOriginValue();
+      err.columnNumber = columnNumber;
     }
   }
 

js/src/vm/CompilationAndEvaluation.cpp

@@ -22,6 +22,7 @@
 #include "frontend/FrontendContext.h"     // js::AutoReportFrontendContext
 #include "frontend/Parser.h"  // frontend::Parser, frontend::ParseGoal
 #include "js/CharacterEncoding.h"  // JS::UTF8Chars, JS::ConstUTF8CharsZ, JS::UTF8CharsToNewTwoByteCharsZ
+#include "js/ColumnNumber.h"            // JS::ColumnNumberZeroOrigin
 #include "js/experimental/JSStencil.h"  // JS::Stencil
 #include "js/friend/ErrorMessages.h"    // js::GetErrorMessage, JSMSG_*
 #include "js/RootingAPI.h"              // JS::Rooted
@@ -64,7 +65,7 @@ static void ReportSourceTooLongImpl(JS::FrontendContext* fc, ...) {
   js::ErrorMetadata metadata;
   metadata.filename = JS::ConstUTF8CharsZ("<unknown>");
   metadata.lineNumber = 0;
-  metadata.columnNumber = 0;
+  metadata.columnNumber = JS::ColumnNumberZeroOrigin::zero();
   metadata.lineLength = 0;
   metadata.tokenOffset = 0;
   metadata.isMuted = false;

js/src/vm/ErrorReporting.cpp

@@ -14,6 +14,7 @@
 
 #include "frontend/FrontendContext.h"  // AutoReportFrontendContext
 #include "js/CharacterEncoding.h"      // JS::ConstUTF8CharsZ
+#include "js/ColumnNumber.h"           // JS::ColumnNumberZeroOrigin
 #include "js/ErrorReport.h"            // JSErrorBase
 #include "js/friend/ErrorMessages.h"   // js::GetErrorMessage, JSMSG_*
 #include "js/Printf.h"                 // JS_vsmprintf
@@ -68,7 +69,7 @@ bool js::ReportCompileWarning(FrontendContext* fc, ErrorMetadata&& metadata,
 
   err.filename = JS::ConstUTF8CharsZ(metadata.filename);
   err.lineno = metadata.lineNumber;
-  err.column = JSErrorBase::fromZeroOriginToOneOrigin(metadata.columnNumber);
+  err.column = metadata.columnNumber.oneOriginValue();
   err.isMuted = metadata.isMuted;
 
   if (UniqueTwoByteChars lineOfContext = std::move(metadata.lineOfContext)) {
@@ -97,7 +98,7 @@ static void ReportCompileErrorImpl(FrontendContext* fc,
 
   err.filename = JS::ConstUTF8CharsZ(metadata.filename);
   err.lineno = metadata.lineNumber;
-  err.column = JSErrorBase::fromZeroOriginToOneOrigin(metadata.columnNumber);
+  err.column = metadata.columnNumber.oneOriginValue();
   err.isMuted = metadata.isMuted;
 
   if (UniqueTwoByteChars lineOfContext = std::move(metadata.lineOfContext)) {

js/src/vm/ErrorReporting.h

@@ -12,6 +12,7 @@
 #include "jsfriendapi.h"  // for ScriptEnvironmentPreparer
 
 #include "js/CharacterEncoding.h"  // JS::ConstUTF8CharsZ
+#include "js/ColumnNumber.h"       // JS::ColumnNumberZeroOrigin
 #include "js/ErrorReport.h"        // for JSErrorNotes, JSErrorReport
 #include "js/UniquePtr.h"          // for UniquePtr
 #include "js/Utility.h"            // for UniqueTwoByteChars
@@ -41,8 +42,8 @@ struct ErrorMetadata {
   // Line number (1-origin).
   uint32_t lineNumber;
 
-  // Column number in UTF-16 code units (0-origin).
-  uint32_t columnNumber;
+  // Column number in UTF-16 code units.
+  JS::ColumnNumberZeroOrigin columnNumber;
 
   // If the error occurs at a particular location, context surrounding the
   // location of the error: the line that contained the error, or a small

js/src/vm/HelperThreads.cpp

@@ -636,7 +636,7 @@ static void ReportDecodeFailure(JS::FrontendContext* fc) {
   js::ErrorMetadata metadata;
   metadata.filename = JS::ConstUTF8CharsZ("<unknown>");
   metadata.lineNumber = 0;
-  metadata.columnNumber = 0;
+  metadata.columnNumber = JS::ColumnNumberZeroOrigin::zero();
   metadata.lineLength = 0;
   metadata.tokenOffset = 0;
   metadata.isMuted = false;

js/src/vm/JSONParser.cpp

@@ -26,6 +26,7 @@
 #include "gc/Tracer.h"                // JS::TraceRoot
 #include "js/AllocPolicy.h"           // ReportOutOfMemory
 #include "js/CharacterEncoding.h"     // JS::ConstUTF8CharsZ
+#include "js/ColumnNumber.h"          // JS::ColumnNumberZeroOrigin
 #include "js/ErrorReport.h"           // JS_ReportErrorNumberASCII
 #include "js/friend/ErrorMessages.h"  // js::GetErrorMessage, JSMSG_*
 #include "js/GCVector.h"              // JS::GCVector
@@ -1055,7 +1056,7 @@ void JSONSyntaxParseHandler<CharT>::reportError(const char* msg,
   metadata.isMuted = false;
   metadata.filename = JS::ConstUTF8CharsZ("");
   metadata.lineNumber = 0;
-  metadata.columnNumber = 0;
+  metadata.columnNumber = JS::ColumnNumberZeroOrigin::zero();
 
   ReportJSONSyntaxError(fc, std::move(metadata), JSMSG_JSON_BAD_PARSE, msg,
                         lineString, columnString);