corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1861309 - Part 1: Use 1-origin column number in JS::GetRequestedModuleSourcePos and ModuleLoaderBase::HandleResolveFailure. r=jonco

Browse Source 
Depends on D192781

Differential Revision: https://phabricator.services.mozilla.com/D192782
This commit is contained in:
Tooru Fujisawa
2023-11-08 02:01:37 +00:00
parent 1d795b5384
commit 23abc3de71
4 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
js/loader/ModuleLoaderBase.cpp
View File

@@ -13,7 +13,7 @@
#include "js/Array.h" // JS::GetArrayLength
#include "js/CompilationAndEvaluation.h"
#include "js/ColumnNumber.h" // JS::ColumnNumberZeroOrigin, JS::ColumnNumberOneOrigin
#include "js/ColumnNumber.h" // JS::ColumnNumberOneOrigin
#include "js/ContextOptions.h" // JS::ContextOptionsRef
#include "js/ErrorReport.h" // JSErrorBase
#include "js/friend/ErrorMessages.h" // js::GetErrorMessage, JSMSG_*
@@ -223,7 +223,7 @@ JSString* ModuleLoaderBase::ImportMetaResolveImpl(
JS::Rooted<JS::Value> error(aCx);
nsresult rv = loader->HandleResolveFailure(
aCx, script, specifier, result.unwrapErr(), 0,
JS::ColumnNumberZeroOrigin::zero(), &error);
JS::ColumnNumberOneOrigin(), &error);
if (NS_FAILED(rv)) {
JS_ReportOutOfMemory(aCx);
return nullptr;
@@ -317,9 +317,9 @@ bool ModuleLoaderBase::HostImportModuleDynamically(
auto result = loader->ResolveModuleSpecifier(script, specifier);
if (result.isErr()) {
JS::Rooted<JS::Value> error(aCx);
nsresult rv = loader->HandleResolveFailure(
aCx, script, specifier, result.unwrapErr(), 0,
JS::ColumnNumberZeroOrigin::zero(), &error);
nsresult rv =
loader->HandleResolveFailure(aCx, script, specifier, result.unwrapErr(),
0, JS::ColumnNumberOneOrigin(), &error);
if (NS_FAILED(rv)) {
JS_ReportOutOfMemory(aCx);
return false;
@@ -703,7 +703,7 @@ nsresult ModuleLoaderBase::GetResolveFailureMessage(ResolveError aError,
nsresult ModuleLoaderBase::HandleResolveFailure(
JSContext* aCx, LoadedScript* aScript, const nsAString& aSpecifier,
ResolveError aError, uint32_t aLineNumber,
JS::ColumnNumberZeroOrigin aColumnNumber,
JS::ColumnNumberOneOrigin aColumnNumber,
JS::MutableHandle<JS::Value> aErrorOut) {
JS::Rooted<JSString*> filename(aCx);
if (aScript) {
@@ -728,8 +728,8 @@ nsresult ModuleLoaderBase::HandleResolveFailure(
}
if (!JS::CreateError(aCx, JSEXN_TYPEERR, nullptr, filename, aLineNumber,
JS::ColumnNumberOneOrigin(aColumnNumber), nullptr,
string, JS::NothingHandleValue, aErrorOut)) {
aColumnNumber, nullptr, string, JS::NothingHandleValue,
aErrorOut)) {
return NS_ERROR_OUT_OF_MEMORY;
}
@@ -824,7 +824,7 @@ nsresult ModuleLoaderBase::ResolveRequestedModules(
auto result = loader->ResolveModuleSpecifier(ms, specifier);
if (result.isErr()) {
uint32_t lineNumber = 0;
JS::ColumnNumberZeroOrigin columnNumber;
JS::ColumnNumberOneOrigin columnNumber;
JS::GetRequestedModuleSourcePos(cx, moduleRecord, i, &lineNumber,
&columnNumber);