diff --git a/dom/script/ModuleScript.cpp b/dom/script/ModuleScript.cpp index 1bf9d0b0f..3d2044a8d 100644 --- a/dom/script/ModuleScript.cpp +++ b/dom/script/ModuleScript.cpp @@ -59,9 +59,9 @@ ModuleScript::UnlinkModuleRecord() { // Remove module's back reference to this object request if present. if (mModuleRecord) { - MOZ_ASSERT(JS::GetModuleHostDefinedField(mModuleRecord).toPrivate() == + MOZ_ASSERT(JS::GetModulePrivate(mModuleRecord).toPrivate() == this); - JS::SetModuleHostDefinedField(mModuleRecord, JS::UndefinedValue()); + JS::SetModulePrivate(mModuleRecord, JS::UndefinedValue()); mModuleRecord = nullptr; } } @@ -84,7 +84,7 @@ ModuleScript::SetModuleRecord(JS::Handle aModuleRecord) // Make module's host defined field point to this module script object. // This is cleared in the UnlinkModuleRecord(). - JS::SetModuleHostDefinedField(mModuleRecord, JS::PrivateValue(this)); + JS::SetModulePrivate(mModuleRecord, JS::PrivateValue(this)); HoldJSObjects(this); } diff --git a/dom/script/ScriptLoader.cpp b/dom/script/ScriptLoader.cpp index a90eab661..e9879d911 100644 --- a/dom/script/ScriptLoader.cpp +++ b/dom/script/ScriptLoader.cpp @@ -800,13 +800,13 @@ ScriptLoader::StartFetchingModuleAndDependencies(ModuleLoadRequest* aParent, // 8.1.3.8.1 HostResolveImportedModule(referencingModule, specifier) JSObject* -HostResolveImportedModule(JSContext* aCx, JS::Handle aModule, +HostResolveImportedModule(JSContext* aCx, + JS::Handle aReferencingPrivate, JS::Handle aSpecifier) { // Let referencing module script be referencingModule.[[HostDefined]]. - JS::Value value = JS::GetModuleHostDefinedField(aModule); - auto script = static_cast(value.toPrivate()); - MOZ_ASSERT(script->ModuleRecord() == aModule); + auto script = static_cast(aReferencingPrivate.toPrivate()); + MOZ_ASSERT(JS::GetModulePrivate(script->ModuleRecord()) == aReferencingPrivate); // Let url be the result of resolving a module specifier given referencing // module script and specifier. @@ -814,7 +814,7 @@ HostResolveImportedModule(JSContext* aCx, JS::Handle aModule, if (!string.init(aCx, aSpecifier)) { return nullptr; } - if (!aModule || !aCx) { + if (!script || !aCx) { // Our module context was ripped out from under us... return nullptr; } diff --git a/dom/script/ScriptLoader.h b/dom/script/ScriptLoader.h index d88eee3a0..c15551996 100644 --- a/dom/script/ScriptLoader.h +++ b/dom/script/ScriptLoader.h @@ -648,8 +648,9 @@ private: ModuleScript* GetFetchedModule(nsIURI* aURL) const; friend JSObject* - HostResolveImportedModule(JSContext* aCx, JS::Handle aModule, - JS::Handle aSpecifier); + HostResolveImportedModule(JSContext* aCx, + JS::Handle aReferencingPrivate, + JS::Handle aSpecifier); nsresult CreateModuleScript(ModuleLoadRequest* aRequest); nsresult ProcessFetchedModuleSource(ModuleLoadRequest* aRequest); diff --git a/js/src/builtin/ModuleObject.cpp b/js/src/builtin/ModuleObject.cpp index 4f263ec33..93702d6bb 100644 --- a/js/src/builtin/ModuleObject.cpp +++ b/js/src/builtin/ModuleObject.cpp @@ -726,6 +726,12 @@ ModuleObject::namespace_() return &value.toObject().as(); } +ScriptSourceObject* +ModuleObject::scriptSourceObject() const +{ + return &getReservedSlot(ScriptSourceObjectSlot).toObject().as(); +} + FunctionDeclarationVector* ModuleObject::functionDeclarations() { @@ -739,8 +745,10 @@ ModuleObject::functionDeclarations() void ModuleObject::init(HandleScript script) { + MOZ_ASSERT(script); initReservedSlot(ScriptSlot, PrivateValue(script)); initReservedSlot(StatusSlot, Int32Value(MODULE_STATUS_UNINSTANTIATED)); + initReservedSlot(ScriptSourceObjectSlot, ObjectValue(script->scriptSourceUnwrap())); } void @@ -869,18 +877,6 @@ ModuleObject::evaluationError() const return getReservedSlot(EvaluationErrorSlot); } -Value -ModuleObject::hostDefinedField() const -{ - return getReservedSlot(HostDefinedSlot); -} - -void -ModuleObject::setHostDefinedField(const JS::Value& value) -{ - setReservedSlot(HostDefinedSlot, value); -} - Scope* ModuleObject::enclosingScope() const { diff --git a/js/src/builtin/ModuleObject.h b/js/src/builtin/ModuleObject.h index ccb1d1ff8..501a66c87 100644 --- a/js/src/builtin/ModuleObject.h +++ b/js/src/builtin/ModuleObject.h @@ -222,7 +222,7 @@ class ModuleObject : public NativeObject NamespaceSlot, StatusSlot, EvaluationErrorSlot, - HostDefinedSlot, + ScriptSourceObjectSlot, RequestedModulesSlot, ImportEntriesSlot, LocalExportEntriesSlot, @@ -274,7 +274,7 @@ class ModuleObject : public NativeObject ModuleStatus status() const; bool hadEvaluationError() const; Value evaluationError() const; - Value hostDefinedField() const; + ScriptSourceObject* scriptSourceObject() const; ArrayObject& requestedModules() const; ArrayObject& importEntries() const; ArrayObject& localExportEntries() const; @@ -287,8 +287,6 @@ class ModuleObject : public NativeObject static bool Instantiate(JSContext* cx, HandleModuleObject self); static bool Evaluate(JSContext* cx, HandleModuleObject self); - void setHostDefinedField(const JS::Value& value); - // For BytecodeEmitter. bool noteFunctionDeclaration(ExclusiveContext* cx, HandleAtom name, HandleFunction fun); diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp index abcf69e53..542090712 100644 --- a/js/src/jsapi.cpp +++ b/js/src/jsapi.cpp @@ -4745,15 +4745,27 @@ JS::CompileModule(JSContext* cx, const ReadOnlyCompileOptions& options, } JS_PUBLIC_API(void) -JS::SetModuleHostDefinedField(JSObject* module, const JS::Value& value) +JS::SetModulePrivate(JSObject* module, const JS::Value& value) { - module->as().setHostDefinedField(value); + module->as().scriptSourceObject()->setPrivate(value); } JS_PUBLIC_API(JS::Value) -JS::GetModuleHostDefinedField(JSObject* module) +JS::GetModulePrivate(JSObject* module) { - return module->as().hostDefinedField(); + return module->as().scriptSourceObject()->getPrivate(); +} + +JS_PUBLIC_API(void) +JS::SetScriptPrivate(JSScript* script, const JS::Value& value) +{ + script->scriptSourceUnwrap().setPrivate(value); +} + +JS_PUBLIC_API(JS::Value) +JS::GetScriptPrivate(JSScript* script) +{ + return script->scriptSourceUnwrap().getPrivate(); } JS_PUBLIC_API(bool) diff --git a/js/src/jsapi.h b/js/src/jsapi.h index 98300b13a..48f5571c4 100644 --- a/js/src/jsapi.h +++ b/js/src/jsapi.h @@ -4372,7 +4372,7 @@ extern JS_PUBLIC_API(bool) Evaluate(JSContext* cx, const ReadOnlyCompileOptions& options, const char* filename, JS::MutableHandleValue rval); -using ModuleResolveHook = JSObject* (*)(JSContext*, HandleObject, HandleString); +using ModuleResolveHook = JSObject* (*)(JSContext*, HandleValue, HandleString); /** * Get the HostResolveImportedModule hook for the runtime. @@ -4395,17 +4395,30 @@ CompileModule(JSContext* cx, const ReadOnlyCompileOptions& options, SourceBufferHolder& srcBuf, JS::MutableHandleObject moduleRecord); /** - * Set the [[HostDefined]] field of a source text module record to the given - * value. + * Set a private value associated with a source text module record. */ extern JS_PUBLIC_API(void) -SetModuleHostDefinedField(JSObject* module, const JS::Value& value); +SetModulePrivate(JSObject* module, const JS::Value& value); /** - * Get the [[HostDefined]] field of a source text module record. + * Get the private value associated with a source text module record. */ extern JS_PUBLIC_API(JS::Value) -GetModuleHostDefinedField(JSObject* module); +GetModulePrivate(JSObject* module); + +/** + * Set a private value associated with a script. Note that this value is shared + * by all nested scripts compiled from a single source file. + */ +extern JS_PUBLIC_API(void) +SetScriptPrivate(JSScript* script, const JS::Value& value); + +/** + * Get the private value associated with a script. Note that this value is + * shared by all nested scripts compiled from a single source file. + */ +extern JS_PUBLIC_API(JS::Value) +GetScriptPrivate(JSScript* script); /* * Perform the ModuleInstantiate operation on the given source text module diff --git a/js/src/jsscript.h b/js/src/jsscript.h index a512f2d8b..e423f3474 100644 --- a/js/src/jsscript.h +++ b/js/src/jsscript.h @@ -639,12 +639,22 @@ class ScriptSourceObject : public NativeObject return static_cast(untyped); } + void setPrivate(const Value& value) { + setReservedSlot(PRIVATE_SLOT, value); + } + Value getPrivate() const { + return getReservedSlot(PRIVATE_SLOT); + } + private: - static const uint32_t SOURCE_SLOT = 0; - static const uint32_t ELEMENT_SLOT = 1; - static const uint32_t ELEMENT_PROPERTY_SLOT = 2; - static const uint32_t INTRODUCTION_SCRIPT_SLOT = 3; - static const uint32_t RESERVED_SLOTS = 4; + enum { + SOURCE_SLOT = 0, + ELEMENT_SLOT, + ELEMENT_PROPERTY_SLOT, + INTRODUCTION_SCRIPT_SLOT, + PRIVATE_SLOT, + RESERVED_SLOTS + }; }; enum GeneratorKind { NotGenerator, LegacyGenerator, StarGenerator }; diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp index 6fcf2cb1e..37bd057cd 100644 --- a/js/src/shell/js.cpp +++ b/js/src/shell/js.cpp @@ -4055,12 +4055,12 @@ SetModuleResolveHook(JSContext* cx, unsigned argc, Value* vp) } static JSObject* -CallModuleResolveHook(JSContext* cx, HandleObject module, HandleString specifier) +CallModuleResolveHook(JSContext* cx, HandleValue referencingPrivate, HandleString specifier) { ShellContext* sc = GetShellContext(cx); JS::AutoValueArray<2> args(cx); - args[0].setObject(*module); + args[0].set(referencingPrivate); args[1].setString(specifier); RootedValue result(cx); @@ -4075,6 +4075,53 @@ CallModuleResolveHook(JSContext* cx, HandleObject module, HandleString specifier return &result.toObject(); } +static bool +ReportArgumentTypeError(JSContext* cx, HandleValue value, const char* expected) +{ + const char* typeName = InformalValueTypeName(value); + JS_ReportErrorASCII(cx, "Expected %s, got %s", expected, typeName); + return false; +} + +static bool +ShellSetModulePrivate(JSContext* cx, unsigned argc, Value* vp) +{ + CallArgs args = CallArgsFromVp(argc, vp); + + if (args.length() != 2) { + JS_ReportErrorNumberASCII(cx, GetErrorMessage, nullptr, JSMSG_MORE_ARGS_NEEDED, + "setModulePrivate", "0", "s"); + return false; + } + + if (!args[0].isObject() || !args[0].toObject().is()) { + return ReportArgumentTypeError(cx, args[0], "module object"); + } + + JS::SetModulePrivate(&args[0].toObject(), args[1]); + args.rval().setUndefined(); + return true; +} + +static bool +ShellGetModulePrivate(JSContext* cx, unsigned argc, Value* vp) +{ + CallArgs args = CallArgsFromVp(argc, vp); + + if (args.length() != 1) { + JS_ReportErrorNumberASCII(cx, GetErrorMessage, nullptr, JSMSG_MORE_ARGS_NEEDED, + "getModulePrivate", "0", "s"); + return false; + } + + if (!args[0].isObject() || !args[0].toObject().is()) { + return ReportArgumentTypeError(cx, args[0], "module object"); + } + + args.rval().set(JS::GetModulePrivate(&args[0].toObject())); + return true; +} + static bool GetModuleLoadPath(JSContext* cx, unsigned argc, Value* vp) { @@ -5954,6 +6001,14 @@ static const JSFunctionSpecWithHelp shell_functions[] = { " This hook is used to look up a previously loaded module object. It should\n" " be implemented by the module loader."), + JS_FN_HELP("setModulePrivate", ShellSetModulePrivate, 2, 0, +"setModulePrivate(scriptObject, privateValue)", +" Associate a private value with a module object.\n"), + + JS_FN_HELP("getModulePrivate", ShellGetModulePrivate, 2, 0, +"getModulePrivate(scriptObject)", +" Get the private value associated with a module object.\n"), + JS_FN_HELP("getModuleLoadPath", GetModuleLoadPath, 0, 0, "getModuleLoadPath()", " Return any --module-load-path argument passed to the shell. Used by the\n" diff --git a/js/src/vm/SelfHosting.cpp b/js/src/vm/SelfHosting.cpp index e15c92709..f235fc1e0 100644 --- a/js/src/vm/SelfHosting.cpp +++ b/js/src/vm/SelfHosting.cpp @@ -2081,7 +2081,8 @@ intrinsic_HostResolveImportedModule(JSContext* cx, unsigned argc, Value* vp) } RootedObject result(cx); - result = moduleResolveHook(cx, module, specifier); + RootedValue referencingPrivate(cx, JS::GetModulePrivate(module)); + result = moduleResolveHook(cx, referencingPrivate, specifier); if (!result) return false;