summaryrefslogtreecommitdiff
path: root/js/src/builtin
diff options
context:
space:
mode:
Diffstat (limited to 'js/src/builtin')
-rw-r--r--js/src/builtin/Module.js4
-rw-r--r--js/src/builtin/ModuleObject.cpp128
-rw-r--r--js/src/builtin/ModuleObject.h41
-rw-r--r--js/src/builtin/ReflectParse.cpp3
4 files changed, 140 insertions, 36 deletions
diff --git a/js/src/builtin/Module.js b/js/src/builtin/Module.js
index 355303d44d..a7758484eb 100644
--- a/js/src/builtin/Module.js
+++ b/js/src/builtin/Module.js
@@ -363,7 +363,7 @@ function InnerModuleInstantiation(module, stack, index)
// Step 9
let requestedModules = module.requestedModules;
for (let i = 0; i < requestedModules.length; i++) {
- let required = requestedModules[i];
+ let required = requestedModules[i].moduleSpecifier;
let requiredModule = CallModuleResolveHook(module, required, MODULE_STATUS_UNINSTANTIATED);
index = InnerModuleInstantiation(requiredModule, stack, index);
@@ -591,7 +591,7 @@ function InnerModuleEvaluation(module, stack, index)
// Step 10
let requestedModules = module.requestedModules;
for (let i = 0; i < requestedModules.length; i++) {
- let required = requestedModules[i];
+ let required = requestedModules[i].moduleSpecifier;
let requiredModule =
CallModuleResolveHook(module, required, MODULE_STATUS_INSTANTIATED);
diff --git a/js/src/builtin/ModuleObject.cpp b/js/src/builtin/ModuleObject.cpp
index 2790b1c444..a09dd77dde 100644
--- a/js/src/builtin/ModuleObject.cpp
+++ b/js/src/builtin/ModuleObject.cpp
@@ -125,7 +125,7 @@ GlobalObject::initImportEntryProto(JSContext* cx, Handle<GlobalObject*> global)
if (!DefinePropertiesAndFunctions(cx, proto, protoAccessors, nullptr))
return false;
- global->setReservedSlot(IMPORT_ENTRY_PROTO, ObjectValue(*proto));
+ global->initReservedSlot(IMPORT_ENTRY_PROTO, ObjectValue(*proto));
return true;
}
@@ -203,7 +203,7 @@ GlobalObject::initExportEntryProto(JSContext* cx, Handle<GlobalObject*> global)
if (!DefinePropertiesAndFunctions(cx, proto, protoAccessors, nullptr))
return false;
- global->setReservedSlot(EXPORT_ENTRY_PROTO, ObjectValue(*proto));
+ global->initReservedSlot(EXPORT_ENTRY_PROTO, ObjectValue(*proto));
return true;
}
@@ -241,6 +241,71 @@ ExportEntryObject::create(ExclusiveContext* cx,
}
///////////////////////////////////////////////////////////////////////////
+// RequestedModuleObject
+
+/* static */ const Class
+RequestedModuleObject::class_ = {
+ "RequestedModule",
+ JSCLASS_HAS_RESERVED_SLOTS(RequestedModuleObject::SlotCount) |
+ JSCLASS_IS_ANONYMOUS
+};
+
+DEFINE_GETTER_FUNCTIONS(RequestedModuleObject, moduleSpecifier, ModuleSpecifierSlot)
+DEFINE_GETTER_FUNCTIONS(RequestedModuleObject, lineNumber, LineNumberSlot)
+DEFINE_GETTER_FUNCTIONS(RequestedModuleObject, columnNumber, ColumnNumberSlot)
+
+DEFINE_ATOM_ACCESSOR_METHOD(RequestedModuleObject, moduleSpecifier)
+DEFINE_UINT32_ACCESSOR_METHOD(RequestedModuleObject, lineNumber)
+DEFINE_UINT32_ACCESSOR_METHOD(RequestedModuleObject, columnNumber)
+
+/* static */ bool
+RequestedModuleObject::isInstance(HandleValue value)
+{
+ return value.isObject() && value.toObject().is<RequestedModuleObject>();
+}
+
+/* static */ bool
+GlobalObject::initRequestedModuleProto(JSContext* cx, Handle<GlobalObject*> global)
+{
+ static const JSPropertySpec protoAccessors[] = {
+ JS_PSG("moduleSpecifier", RequestedModuleObject_moduleSpecifierGetter, 0),
+ JS_PSG("lineNumber", RequestedModuleObject_lineNumberGetter, 0),
+ JS_PSG("columnNumber", RequestedModuleObject_columnNumberGetter, 0),
+ JS_PS_END
+ };
+
+ RootedObject proto(cx, GlobalObject::createBlankPrototype<PlainObject>(cx, global));
+ if (!proto)
+ return false;
+
+ if (!DefinePropertiesAndFunctions(cx, proto, protoAccessors, nullptr))
+ return false;
+
+ global->initReservedSlot(REQUESTED_MODULE_PROTO, ObjectValue(*proto));
+ return true;
+}
+
+/* static */ RequestedModuleObject*
+RequestedModuleObject::create(JSContext* cx,
+ HandleAtom moduleSpecifier,
+ uint32_t lineNumber,
+ uint32_t columnNumber)
+{
+ MOZ_ASSERT(lineNumber > 0);
+
+ RootedObject proto(cx, cx->global()->getRequestedModulePrototype());
+ RootedObject obj(cx, NewObjectWithGivenProto(cx, &class_, proto));
+ if (!obj)
+ return nullptr;
+
+ RootedRequestedModuleObject self(cx, &obj->as<RequestedModuleObject>());
+ self->initReservedSlot(ModuleSpecifierSlot, StringValue(moduleSpecifier));
+ self->initReservedSlot(LineNumberSlot, Int32Value(lineNumber));
+ self->initReservedSlot(ColumnNumberSlot, Int32Value(columnNumber));
+ return self;
+}
+
+///////////////////////////////////////////////////////////////////////////
// IndirectBindingMap
IndirectBindingMap::Binding::Binding(ModuleEnvironmentObject* environment, Shape* shape)
@@ -1074,7 +1139,8 @@ ModuleBuilder::ModuleBuilder(ExclusiveContext* cx, HandleModuleObject module,
: cx_(cx),
module_(cx, module),
tokenStream_(tokenStream),
- requestedModules_(cx, AtomVector(cx)),
+ requestedModuleSpecifiers_(cx, AtomSet(cx)),
+ requestedModules_(cx, RequestedModuleVector(cx)),
importedBoundNames_(cx, AtomVector(cx)),
importEntries_(cx, ImportEntryVector(cx)),
exportEntries_(cx, ExportEntryVector(cx)),
@@ -1084,6 +1150,12 @@ ModuleBuilder::ModuleBuilder(ExclusiveContext* cx, HandleModuleObject module,
{}
bool
+ModuleBuilder::init()
+{
+ return requestedModuleSpecifiers_.init();
+}
+
+bool
ModuleBuilder::buildTables()
{
for (const auto& e : exportEntries_) {
@@ -1130,24 +1202,23 @@ ModuleBuilder::buildTables()
bool
ModuleBuilder::initModule()
{
- RootedArrayObject requestedModules(cx_, createArray<JSAtom*>(requestedModules_));
+ RootedArrayObject requestedModules(cx_, createArray(requestedModules_));
if (!requestedModules)
return false;
- RootedArrayObject importEntries(cx_, createArray<ImportEntryObject*>(importEntries_));
+ RootedArrayObject importEntries(cx_, createArray(importEntries_));
if (!importEntries)
return false;
- RootedArrayObject localExportEntries(cx_, createArray<ExportEntryObject*>(localExportEntries_));
+ RootedArrayObject localExportEntries(cx_, createArray(localExportEntries_));
if (!localExportEntries)
return false;
- RootedArrayObject indirectExportEntries(cx_);
- indirectExportEntries = createArray<ExportEntryObject*>(indirectExportEntries_);
+ RootedArrayObject indirectExportEntries(cx_, createArray(indirectExportEntries_));
if (!indirectExportEntries)
return false;
- RootedArrayObject starExportEntries(cx_, createArray<ExportEntryObject*>(starExportEntries_));
+ RootedArrayObject starExportEntries(cx_, createArray(starExportEntries_));
if (!starExportEntries)
return false;
@@ -1169,7 +1240,7 @@ ModuleBuilder::processImport(frontend::ParseNode* pn)
MOZ_ASSERT(pn->pn_right->isKind(PNK_STRING));
RootedAtom module(cx_, pn->pn_right->pn_atom);
- if (!maybeAppendRequestedModule(module))
+ if (!maybeAppendRequestedModule(module, pn->pn_right))
return false;
for (ParseNode* spec = pn->pn_left->pn_head; spec; spec = spec->pn_next) {
@@ -1277,7 +1348,7 @@ ModuleBuilder::processExportFrom(frontend::ParseNode* pn)
MOZ_ASSERT(pn->pn_right->isKind(PNK_STRING));
RootedAtom module(cx_, pn->pn_right->pn_atom);
- if (!maybeAppendRequestedModule(module))
+ if (!maybeAppendRequestedModule(module, pn->pn_right))
return false;
for (ParseNode* spec = pn->pn_left->pn_head; spec; spec = spec->pn_next) {
@@ -1346,29 +1417,26 @@ ModuleBuilder::appendExportFromEntry(HandleAtom exportName, HandleAtom moduleReq
}
bool
-ModuleBuilder::maybeAppendRequestedModule(HandleAtom module)
+ModuleBuilder::maybeAppendRequestedModule(HandleAtom specifier, ParseNode* node)
{
- for (auto m : requestedModules_) {
- if (m == module)
- return true;
+ if (requestedModuleSpecifiers_.has(specifier)) {
+ return true;
}
- return requestedModules_.append(module);
-}
-
-static Value
-MakeElementValue(JSString *string)
-{
- return StringValue(string);
-}
-
-static Value
-MakeElementValue(JSObject *object)
-{
- return ObjectValue(*object);
+ uint32_t line;
+ uint32_t column;
+ tokenStream_.srcCoords.lineNumAndColumnIndex(node->pn_pos.begin, &line, &column);
+ JSContext* cx = reinterpret_cast<JSContext*>(cx_);
+ RootedRequestedModuleObject req(cx, RequestedModuleObject::create(cx, specifier, line, column));
+ if (!req) {
+ return false;
+ }
+ return FreezeObject(cx, req) &&
+ requestedModules_.append(req) &&
+ requestedModuleSpecifiers_.put(specifier);
}
template <typename T>
-ArrayObject* ModuleBuilder::createArray(const GCVector<T>& vector)
+ArrayObject* ModuleBuilder::createArray(const JS::Rooted<GCVector<T>>& vector)
{
uint32_t length = vector.length();
RootedArrayObject array(cx_, NewDenseFullyAllocatedArray(cx_, length));
@@ -1377,7 +1445,7 @@ ArrayObject* ModuleBuilder::createArray(const GCVector<T>& vector)
array->setDenseInitializedLength(length);
for (uint32_t i = 0; i < length; i++)
- array->initDenseElement(i, MakeElementValue(vector[i]));
+ array->initDenseElement(i, ObjectValue(*vector[i]));
return array;
}
diff --git a/js/src/builtin/ModuleObject.h b/js/src/builtin/ModuleObject.h
index dc078e6b28..fde02c6938 100644
--- a/js/src/builtin/ModuleObject.h
+++ b/js/src/builtin/ModuleObject.h
@@ -100,6 +100,32 @@ class ExportEntryObject : public NativeObject
typedef Rooted<ExportEntryObject*> RootedExportEntryObject;
typedef Handle<ExportEntryObject*> HandleExportEntryObject;
+class RequestedModuleObject : public NativeObject
+{
+ public:
+ enum
+ {
+ ModuleSpecifierSlot = 0,
+ LineNumberSlot,
+ ColumnNumberSlot,
+ SlotCount
+ };
+
+ static const Class class_;
+ static JSObject* initClass(JSContext* cx, HandleObject obj);
+ static bool isInstance(HandleValue value);
+ static RequestedModuleObject* create(JSContext* cx,
+ HandleAtom moduleSpecifier,
+ uint32_t lineNumber,
+ uint32_t columnNumber);
+ JSAtom* moduleSpecifier() const;
+ uint32_t lineNumber() const;
+ uint32_t columnNumber() const;
+};
+
+typedef Rooted<RequestedModuleObject*> RootedRequestedModuleObject;
+typedef Handle<RequestedModuleObject*> HandleRequestedModuleObject;
+
class IndirectBindingMap
{
public:
@@ -318,6 +344,8 @@ class MOZ_STACK_CLASS ModuleBuilder
explicit ModuleBuilder(ExclusiveContext* cx, HandleModuleObject module,
const frontend::TokenStream& tokenStream);
+ bool init();
+
bool processImport(frontend::ParseNode* pn);
bool processExport(frontend::ParseNode* pn);
bool processExportFrom(frontend::ParseNode* pn);
@@ -334,15 +362,20 @@ class MOZ_STACK_CLASS ModuleBuilder
private:
using AtomVector = GCVector<JSAtom*>;
- using RootedAtomVector = JS::Rooted<AtomVector>;
using ImportEntryVector = GCVector<ImportEntryObject*>;
+ using RequestedModuleVector = GCVector<RequestedModuleObject*>;
+ using AtomSet = JS::GCHashSet<JSAtom*>;
+ using RootedAtomVector = JS::Rooted<AtomVector>;
using RootedImportEntryVector = JS::Rooted<ImportEntryVector>;
using RootedExportEntryVector = JS::Rooted<ExportEntryVector>;
+ using RootedRequestedModuleVector = JS::Rooted<RequestedModuleVector>;
+ using RootedAtomSet = JS::Rooted<AtomSet>;
ExclusiveContext* cx_;
RootedModuleObject module_;
const frontend::TokenStream& tokenStream_;
- RootedAtomVector requestedModules_;
+ RootedAtomSet requestedModuleSpecifiers_;
+ RootedRequestedModuleVector requestedModules_;
RootedAtomVector importedBoundNames_;
RootedImportEntryVector importEntries_;
RootedExportEntryVector exportEntries_;
@@ -357,10 +390,10 @@ class MOZ_STACK_CLASS ModuleBuilder
bool appendExportFromEntry(HandleAtom exportName, HandleAtom moduleRequest,
HandleAtom importName, frontend::ParseNode* node);
- bool maybeAppendRequestedModule(HandleAtom module);
+ bool maybeAppendRequestedModule(HandleAtom specifier, frontend::ParseNode* node);
template <typename T>
- ArrayObject* createArray(const GCVector<T>& vector);
+ ArrayObject* createArray(const JS::Rooted<GCVector<T>>& vector);
};
} // namespace js
diff --git a/js/src/builtin/ReflectParse.cpp b/js/src/builtin/ReflectParse.cpp
index 65bd16b270..ac69abab91 100644
--- a/js/src/builtin/ReflectParse.cpp
+++ b/js/src/builtin/ReflectParse.cpp
@@ -3741,6 +3741,9 @@ reflect_parse(JSContext* cx, uint32_t argc, Value* vp)
return false;
ModuleBuilder builder(cx, module, parser.tokenStream);
+ if (!builder.init())
+ return false;
+
ModuleSharedContext modulesc(cx, module, &cx->global()->emptyGlobalScope(), builder);
pn = parser.moduleBody(&modulesc);
if (!pn)
generated by cgit v1.2.3 (git 2.26.2) at 2024-11-14 22:57:06 +0000