summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dom/script/ModuleScript.cpp6
-rw-r--r--dom/script/ScriptLoader.cpp8
-rw-r--r--dom/script/ScriptLoader.h5
-rw-r--r--js/src/builtin/ModuleObject.cpp20
-rw-r--r--js/src/builtin/ModuleObject.h6
-rw-r--r--js/src/jsapi.cpp20
-rw-r--r--js/src/jsapi.h25
-rw-r--r--js/src/jsscript.h20
-rw-r--r--js/src/shell/js.cpp59
-rw-r--r--js/src/vm/SelfHosting.cpp3
10 files changed, 43 insertions, 129 deletions
diff --git a/dom/script/ModuleScript.cpp b/dom/script/ModuleScript.cpp
index b2a72e628..9f7fe9ab9 100644
--- a/dom/script/ModuleScript.cpp
+++ b/dom/script/ModuleScript.cpp
@@ -58,9 +58,9 @@ ModuleScript::UnlinkModuleRecord()
{
// Remove module's back reference to this object request if present.
if (mModuleRecord) {
- MOZ_ASSERT(JS::GetModulePrivate(mModuleRecord).toPrivate() ==
+ MOZ_ASSERT(JS::GetModuleHostDefinedField(mModuleRecord).toPrivate() ==
this);
- JS::SetModulePrivate(mModuleRecord, JS::UndefinedValue());
+ JS::SetModuleHostDefinedField(mModuleRecord, JS::UndefinedValue());
mModuleRecord = nullptr;
}
}
@@ -83,7 +83,7 @@ ModuleScript::SetModuleRecord(JS::Handle<JSObject*> aModuleRecord)
// Make module's host defined field point to this module script object.
// This is cleared in the UnlinkModuleRecord().
- JS::SetModulePrivate(mModuleRecord, JS::PrivateValue(this));
+ JS::SetModuleHostDefinedField(mModuleRecord, JS::PrivateValue(this));
HoldJSObjects(this);
}
diff --git a/dom/script/ScriptLoader.cpp b/dom/script/ScriptLoader.cpp
index 8058c8caa..5b7bea8d2 100644
--- a/dom/script/ScriptLoader.cpp
+++ b/dom/script/ScriptLoader.cpp
@@ -798,13 +798,13 @@ ScriptLoader::StartFetchingModuleAndDependencies(ModuleLoadRequest* aParent,
// 8.1.3.8.1 HostResolveImportedModule(referencingModule, specifier)
JSObject*
-HostResolveImportedModule(JSContext* aCx,
- JS::Handle<JS::Value> aReferencingPrivate,
+HostResolveImportedModule(JSContext* aCx, JS::Handle<JSObject*> aModule,
JS::Handle<JSString*> aSpecifier)
{
// Let referencing module script be referencingModule.[[HostDefined]].
- auto script = static_cast<ModuleScript*>(aReferencingPrivate.toPrivate());
- MOZ_ASSERT(JS::GetModulePrivate(script->ModuleRecord()) == aReferencingPrivate);
+ JS::Value value = JS::GetModuleHostDefinedField(aModule);
+ auto script = static_cast<ModuleScript*>(value.toPrivate());
+ MOZ_ASSERT(script->ModuleRecord() == aModule);
// Let url be the result of resolving a module specifier given referencing
// module script and specifier.
diff --git a/dom/script/ScriptLoader.h b/dom/script/ScriptLoader.h
index 8cbcf7b96..ec9524f14 100644
--- a/dom/script/ScriptLoader.h
+++ b/dom/script/ScriptLoader.h
@@ -630,9 +630,8 @@ private:
ModuleScript* GetFetchedModule(nsIURI* aURL) const;
friend JSObject*
- HostResolveImportedModule(JSContext* aCx,
- JS::Handle<JS::Value> aReferencingPrivate,
- JS::Handle<JSString*> aSpecifier);
+ HostResolveImportedModule(JSContext* aCx, JS::Handle<JSObject*> aModule,
+ JS::Handle<JSString*> aSpecifier);
nsresult CreateModuleScript(ModuleLoadRequest* aRequest);
nsresult ProcessFetchedModuleSource(ModuleLoadRequest* aRequest);
diff --git a/js/src/builtin/ModuleObject.cpp b/js/src/builtin/ModuleObject.cpp
index ae966c89a..2790b1c44 100644
--- a/js/src/builtin/ModuleObject.cpp
+++ b/js/src/builtin/ModuleObject.cpp
@@ -725,12 +725,6 @@ ModuleObject::namespace_()
return &value.toObject().as<ModuleNamespaceObject>();
}
-ScriptSourceObject*
-ModuleObject::scriptSourceObject() const
-{
- return &getReservedSlot(ScriptSourceObjectSlot).toObject().as<ScriptSourceObject>();
-}
-
FunctionDeclarationVector*
ModuleObject::functionDeclarations()
{
@@ -744,10 +738,8 @@ 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
@@ -876,6 +868,18 @@ 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 c2514e876..dc078e6b2 100644
--- a/js/src/builtin/ModuleObject.h
+++ b/js/src/builtin/ModuleObject.h
@@ -219,7 +219,7 @@ class ModuleObject : public NativeObject
NamespaceSlot,
StatusSlot,
EvaluationErrorSlot,
- ScriptSourceObjectSlot,
+ HostDefinedSlot,
RequestedModulesSlot,
ImportEntriesSlot,
LocalExportEntriesSlot,
@@ -271,7 +271,7 @@ class ModuleObject : public NativeObject
ModuleStatus status() const;
bool hadEvaluationError() const;
Value evaluationError() const;
- ScriptSourceObject* scriptSourceObject() const;
+ Value hostDefinedField() const;
ArrayObject& requestedModules() const;
ArrayObject& importEntries() const;
ArrayObject& localExportEntries() const;
@@ -284,6 +284,8 @@ 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 74d64e312..dab4c25a4 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -4691,27 +4691,15 @@ JS::CompileModule(JSContext* cx, const ReadOnlyCompileOptions& options,
}
JS_PUBLIC_API(void)
-JS::SetModulePrivate(JSObject* module, const JS::Value& value)
+JS::SetModuleHostDefinedField(JSObject* module, const JS::Value& value)
{
- module->as<ModuleObject>().scriptSourceObject()->setPrivate(value);
+ module->as<ModuleObject>().setHostDefinedField(value);
}
JS_PUBLIC_API(JS::Value)
-JS::GetModulePrivate(JSObject* module)
+JS::GetModuleHostDefinedField(JSObject* module)
{
- return module->as<ModuleObject>().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();
+ return module->as<ModuleObject>().hostDefinedField();
}
JS_PUBLIC_API(bool)
diff --git a/js/src/jsapi.h b/js/src/jsapi.h
index 82477f9a7..f8203ee1f 100644
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -4324,7 +4324,7 @@ extern JS_PUBLIC_API(bool)
Evaluate(JSContext* cx, const ReadOnlyCompileOptions& options,
const char* filename, JS::MutableHandleValue rval);
-using ModuleResolveHook = JSObject* (*)(JSContext*, HandleValue, HandleString);
+using ModuleResolveHook = JSObject* (*)(JSContext*, HandleObject, HandleString);
/**
* Get the HostResolveImportedModule hook for the runtime.
@@ -4347,30 +4347,17 @@ CompileModule(JSContext* cx, const ReadOnlyCompileOptions& options,
SourceBufferHolder& srcBuf, JS::MutableHandleObject moduleRecord);
/**
- * Set a private value associated with a source text module record.
+ * Set the [[HostDefined]] field of a source text module record to the given
+ * value.
*/
extern JS_PUBLIC_API(void)
-SetModulePrivate(JSObject* module, const JS::Value& value);
+SetModuleHostDefinedField(JSObject* module, const JS::Value& value);
/**
- * Get the private value associated with a source text module record.
+ * Get the [[HostDefined]] field of a source text module record.
*/
extern JS_PUBLIC_API(JS::Value)
-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);
+GetModuleHostDefinedField(JSObject* module);
/*
* Perform the ModuleInstantiate operation on the given source text module
diff --git a/js/src/jsscript.h b/js/src/jsscript.h
index fd5c96a16..d8d28ebeb 100644
--- a/js/src/jsscript.h
+++ b/js/src/jsscript.h
@@ -638,22 +638,12 @@ class ScriptSourceObject : public NativeObject
return static_cast<JSScript*>(untyped);
}
- void setPrivate(const Value& value) {
- setReservedSlot(PRIVATE_SLOT, value);
- }
- Value getPrivate() const {
- return getReservedSlot(PRIVATE_SLOT);
- }
-
private:
- enum {
- SOURCE_SLOT = 0,
- ELEMENT_SLOT,
- ELEMENT_PROPERTY_SLOT,
- INTRODUCTION_SCRIPT_SLOT,
- PRIVATE_SLOT,
- RESERVED_SLOTS
- };
+ 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 GeneratorKind { NotGenerator, LegacyGenerator, StarGenerator };
diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp
index acd2ec207..6e155d3ff 100644
--- a/js/src/shell/js.cpp
+++ b/js/src/shell/js.cpp
@@ -4039,12 +4039,12 @@ SetModuleResolveHook(JSContext* cx, unsigned argc, Value* vp)
}
static JSObject*
-CallModuleResolveHook(JSContext* cx, HandleValue referencingPrivate, HandleString specifier)
+CallModuleResolveHook(JSContext* cx, HandleObject module, HandleString specifier)
{
ShellContext* sc = GetShellContext(cx);
JS::AutoValueArray<2> args(cx);
- args[0].set(referencingPrivate);
+ args[0].setObject(*module);
args[1].setString(specifier);
RootedValue result(cx);
@@ -4060,53 +4060,6 @@ CallModuleResolveHook(JSContext* cx, HandleValue referencingPrivate, HandleStrin
}
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<ModuleObject>()) {
- 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<ModuleObject>()) {
- 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)
{
CallArgs args = CallArgsFromVp(argc, vp);
@@ -5974,14 +5927,6 @@ 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 781ddcf16..dc1dfb9fa 100644
--- a/js/src/vm/SelfHosting.cpp
+++ b/js/src/vm/SelfHosting.cpp
@@ -2035,8 +2035,7 @@ intrinsic_HostResolveImportedModule(JSContext* cx, unsigned argc, Value* vp)
}
RootedObject result(cx);
- RootedValue referencingPrivate(cx, JS::GetModulePrivate(module));
- result = moduleResolveHook(cx, referencingPrivate, specifier);
+ result = moduleResolveHook(cx, module, specifier);
if (!result)
return false;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 23:34:51 +0000