Bug 1847469 - Part 7: Use column number types in FrameIter and SavedF…

…rame internal. r=iain

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

js/src/frontend/TokenStream.cpp

@@ -35,8 +35,8 @@
 #include "frontend/ParserAtom.h"
 #include "frontend/ReservedWords.h"
 #include "js/CharacterEncoding.h"  // JS::ConstUTF8CharsZ
-#include "js/ColumnNumber.h"  // JS::LimitedColumnNumberZeroOrigin, JS::ColumnNumberZeroOrigin
-#include "js/ErrorReport.h"           // JSErrorBase
+#include "js/ColumnNumber.h"  // JS::LimitedColumnNumberZeroOrigin, JS::ColumnNumberZeroOrigin, JS::TaggedColumnNumberZeroOrigin
+#include "js/ErrorReport.h"   // JSErrorBase
 #include "js/friend/ErrorMessages.h"  // js::GetErrorMessage, JSMSG_*
 #include "js/Printf.h"                // JS_smprintf
 #include "js/RegExpFlags.h"           // JS::RegExpFlags
@@ -1477,9 +1477,11 @@ bool TokenStreamAnyChars::fillExceptingContext(ErrorMetadata* err,
                                maybeCx->realm()->principals());
       if (!iter.done() && iter.filename()) {
         err->filename = JS::ConstUTF8CharsZ(iter.filename());
-        uint32_t columnNumber;
+        JS::TaggedColumnNumberZeroOrigin columnNumber;
         err->lineNumber = iter.computeLine(&columnNumber);
-        err->columnNumber = JS::ColumnNumberZeroOrigin(columnNumber);
+        // NOTE: Wasm frame cannot appear here.
+        err->columnNumber =
+            JS::ColumnNumberZeroOrigin(columnNumber.toLimitedColumnNumber());
         return false;
       }
     }

js/src/jsapi.cpp

@@ -42,6 +42,7 @@
 #include "jit/JitSpewer.h"
 #include "js/CallAndConstruct.h"  // JS::IsCallable
 #include "js/CharacterEncoding.h"
+#include "js/ColumnNumber.h"  // JS::TaggedColumnNumberZeroOrigin
 #include "js/CompileOptions.h"
 #include "js/ContextOptions.h"  // JS::ContextOptions{,Ref}
 #include "js/Conversions.h"
@@ -4563,9 +4564,15 @@ JS_PUBLIC_API bool DescribeScriptedCaller(JSContext* cx, AutoFilename* filename,
   }
 
   if (lineno) {
-    *lineno = i.computeLine(column);
+    JS::TaggedColumnNumberZeroOrigin columnNumber;
+    *lineno = i.computeLine(&columnNumber);
+    if (column) {
+      *column = columnNumber.zeroOriginValue();
+    }
   } else if (column) {
-    i.computeLine(column);
+    JS::TaggedColumnNumberZeroOrigin columnNumber;
+    i.computeLine(&columnNumber);
+    *column = columnNumber.zeroOriginValue();
   }
 
   return true;

js/src/jsexn.cpp

@@ -28,6 +28,7 @@
 #include "frontend/FrontendContext.h"  // AutoReportFrontendContext
 #include "js/CharacterEncoding.h"      // JS::UTF8Chars, JS::ConstUTF8CharsZ
 #include "js/Class.h"
+#include "js/ColumnNumber.h"  // JS::TaggedColumnNumberZeroOrigin
 #include "js/Conversions.h"
 #include "js/ErrorReport.h"             // JS::PrintError
 #include "js/Exception.h"               // JS::ExceptionStack
@@ -674,20 +675,19 @@ bool JS::ErrorReportBuilder::populateUncaughtExceptionReportUTF8VA(
     ownedReport.filename = JS::ConstUTF8CharsZ(filename.get());
     ownedReport.sourceId = frame->getSourceId();
     ownedReport.lineno = frame->getLine();
-    // Follow FixupMaybeWASMColumnForDisplay and set column to 1 for WASM.
-    ownedReport.column = frame->isWasm() ? 1 : frame->getColumn();
+    ownedReport.column = frame->getColumn().oneOriginValue();
     ownedReport.isMuted = frame->getMutedErrors();
   } else {
     // XXXbz this assumes the stack we have right now is still
     // related to our exception object.
     NonBuiltinFrameIter iter(cx, cx->realm()->principals());
     if (!iter.done()) {
       ownedReport.filename = JS::ConstUTF8CharsZ(iter.filename());
-      uint32_t column;
+      JS::TaggedColumnNumberZeroOrigin column;
       ownedReport.sourceId =
           iter.hasScript() ? iter.script()->scriptSource()->id() : 0;
       ownedReport.lineno = iter.computeLine(&column);
-      ownedReport.column = FixupMaybeWASMColumnForDisplay(column);
+      ownedReport.column = column.oneOriginValue();
       ownedReport.isMuted = iter.mutedErrors();
     }
   }

js/src/vm/ErrorObject.cpp

@@ -24,6 +24,7 @@
 #include "js/CallNonGenericMethod.h"
 #include "js/CharacterEncoding.h"  // JS::ConstUTF8CharsZ
 #include "js/Class.h"
+#include "js/ColumnNumber.h"  // JS::ColumnNumberOneOrigin, JS::TaggedColumnNumberZeroOrigin
 #include "js/Conversions.h"
 #include "js/ErrorReport.h"
 #include "js/friend/ErrorMessages.h"  // js::GetErrorMessage, JSMSG_*
@@ -258,14 +259,16 @@ static ErrorObject* CreateErrorObject(JSContext* cx, const CallArgs& args,
     return nullptr;
   }
 
-  uint32_t lineNumber, columnNumber = 0;
+  uint32_t lineNumber;
+  JS::ColumnNumberOneOrigin columnNumber;
   if (!hasOptions && args.length() > messageArg + 2) {
     if (!ToUint32(cx, args[messageArg + 2], &lineNumber)) {
       return nullptr;
     }
   } else {
-    lineNumber = iter.done() ? 0 : iter.computeLine(&columnNumber);
-    columnNumber = FixupMaybeWASMColumnForDisplay(columnNumber);
+    JS::TaggedColumnNumberZeroOrigin tmp;
+    lineNumber = iter.done() ? 0 : iter.computeLine(&tmp);
+    columnNumber = JS::ColumnNumberOneOrigin(tmp.oneOriginValue());
   }
 
   RootedObject stack(cx);
@@ -274,7 +277,8 @@ static ErrorObject* CreateErrorObject(JSContext* cx, const CallArgs& args,
   }
 
   return ErrorObject::create(cx, exnType, stack, fileName, sourceId, lineNumber,
-                             columnNumber, nullptr, message, cause, proto);
+                             columnNumber.oneOriginValue(), nullptr, message,
+                             cause, proto);
 }
 
 static bool Error(JSContext* cx, unsigned argc, Value* vp) {

js/src/vm/ErrorReporting.cpp

@@ -14,15 +14,14 @@
 
 #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
-#include "js/Warnings.h"               // JS::WarningReporter
+#include "js/ColumnNumber.h"  // JS::ColumnNumberZeroOrigin, JS::TaggedColumnNumberZeroOrigin
+#include "js/ErrorReport.h"           // JSErrorBase
+#include "js/friend/ErrorMessages.h"  // js::GetErrorMessage, JSMSG_*
+#include "js/Printf.h"                // JS_vsmprintf
+#include "js/Warnings.h"              // JS::WarningReporter
 #include "vm/FrameIter.h"
 #include "vm/GlobalObject.h"
 #include "vm/JSContext.h"
-#include "vm/SavedStacks.h"  // FixupMaybeWASMColumnForDisplay
 
 using namespace js;
 
@@ -197,9 +196,9 @@ static void PopulateReportBlame(JSContext* cx, JSErrorReport* report) {
   if (iter.hasScript()) {
     report->sourceId = iter.script()->scriptSource()->id();
   }
-  uint32_t column;
+  JS::TaggedColumnNumberZeroOrigin column;
   report->lineno = iter.computeLine(&column);
-  report->column = FixupMaybeWASMColumnForDisplay(column);
+  report->column = column.oneOriginValue();
   report->isMuted = iter.mutedErrors();
 }
 

js/src/vm/FrameIter.cpp

@@ -16,10 +16,11 @@
 #include "jit/BaselineFrame.h"   // js::jit::BaselineFrame
 #include "jit/JitFrames.h"       // js::jit::EnsureUnwoundJitExitFrame
 #include "jit/JSJitFrameIter.h"  // js::jit::{FrameType,InlineFrameIterator,JSJitFrameIter,MaybeReadFallback,SnapshotIterator}
-#include "js/GCAPI.h"            // JS::AutoSuppressGCAnalysis
-#include "js/Principals.h"       // JSSubsumesOp
-#include "js/RootingAPI.h"       // JS::Rooted
-#include "vm/Activation.h"       // js::Activation{,Iterator}
+#include "js/ColumnNumber.h"  // JS::LimitedColumnNumberZeroOrigin, JS::TaggedColumnNumberZeroOrigin
+#include "js/GCAPI.h"              // JS::AutoSuppressGCAnalysis
+#include "js/Principals.h"         // JSSubsumesOp
+#include "js/RootingAPI.h"         // JS::Rooted
+#include "vm/Activation.h"         // js::Activation{,Iterator}
 #include "vm/EnvironmentObject.h"  // js::CallObject
 #include "vm/JitActivation.h"      // js::jit::JitActivation
 #include "vm/JSContext.h"          // JSContext
@@ -618,7 +619,8 @@ const char16_t* FrameIter::displayURL() const {
   MOZ_CRASH("Unexpected state");
 }
 
-unsigned FrameIter::computeLine(uint32_t* column) const {
+unsigned FrameIter::computeLine(
+    JS::TaggedColumnNumberZeroOrigin* column) const {
   switch (data_.state_) {
     case DONE:
       break;
@@ -627,7 +629,13 @@ unsigned FrameIter::computeLine(uint32_t* column) const {
       if (isWasm()) {
         return wasmFrame().computeLine(column);
       }
-      return PCToLineNumber(script(), pc(), column);
+      unsigned columnNumber;
+      unsigned lineNumber = PCToLineNumber(script(), pc(), &columnNumber);
+      if (column) {
+        *column = JS::TaggedColumnNumberZeroOrigin(
+            JS::LimitedColumnNumberZeroOrigin(columnNumber));
+      }
+      return lineNumber;
   }
 
   MOZ_CRASH("Unexpected state");

js/src/vm/FrameIter.h

@@ -17,6 +17,7 @@
 #include "jstypes.h"  // JS_PUBLIC_API
 
 #include "jit/JSJitFrameIter.h"  // js::jit::{InlineFrameIterator,JSJitFrameIter}
+#include "js/ColumnNumber.h"     // JS::TaggedColumnNumberZeroOrigin
 #include "js/RootingAPI.h"       // JS::Handle, JS::Rooted
 #include "js/TypeDecls.h"  // jsbytecode, JSContext, JSAtom, JSFunction, JSObject, JSScript
 #include "js/Value.h"       // JS::Value
@@ -283,7 +284,8 @@ class FrameIter {
   ScriptSource* scriptSource() const;
   const char* filename() const;
   const char16_t* displayURL() const;
-  unsigned computeLine(uint32_t* column = nullptr) const;
+  unsigned computeLine(
+      JS::TaggedColumnNumberZeroOrigin* column = nullptr) const;
   JSAtom* maybeFunctionDisplayAtom() const;
   bool mutedErrors() const;
 

js/src/vm/SavedFrame.h

@@ -10,6 +10,7 @@
 #include "mozilla/Attributes.h"
 
 #include "gc/Policy.h"
+#include "js/ColumnNumber.h"  // JS::TaggedColumnNumberOneOrigin
 #include "js/GCHashTable.h"
 #include "js/Principals.h"
 #include "js/UbiNode.h"
@@ -50,8 +51,8 @@ class SavedFrame : public NativeObject {
   uint32_t getSourceId();
   // Line number (1-origin).
   uint32_t getLine();
-  // Column number in UTF-16 code units (1-origin).
-  uint32_t getColumn();
+  // Column number in UTF-16 code units.
+  JS::TaggedColumnNumberOneOrigin getColumn();
   JSAtom* getFunctionDisplayName();
   JSAtom* getAsyncCause();
   SavedFrame* getParent() const;
@@ -123,7 +124,7 @@ class SavedFrame : public NativeObject {
   void initSource(JSAtom* source);
   void initSourceId(uint32_t id);
   void initLine(uint32_t line);
-  void initColumn(uint32_t column);
+  void initColumn(JS::TaggedColumnNumberOneOrigin column);
   void initFunctionDisplayName(JSAtom* maybeName);
   void initAsyncCause(JSAtom* maybeCause);
   void initParent(SavedFrame* maybeParent);
@@ -260,7 +261,7 @@ class ConcreteStackFrame<SavedFrame> : public BaseStackFrame {
 
   StackFrame parent() const override { return get().getParent(); }
   uint32_t line() const override { return get().getLine(); }
-  uint32_t column() const override { return get().getColumn(); }
+  uint32_t column() const override { return get().getColumn().rawValue(); }
 
   AtomOrTwoByteChars source() const override {
     auto source = get().getSource();