From 7bf3e4c46475a7aa936d702eb38d65d9126008f2 Mon Sep 17 00:00:00 2001 From: Moonchild Date: Fri, 3 Jul 2020 14:15:55 +0000 Subject: Issue #618 - Add APIs to query module record errors Ref: BZ 1388728 --- js/src/jsapi.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'js/src/jsapi.h') diff --git a/js/src/jsapi.h b/js/src/jsapi.h index 9138a4a92..5e0259587 100644 --- a/js/src/jsapi.h +++ b/js/src/jsapi.h @@ -4396,6 +4396,12 @@ GetRequestedModules(JSContext* cx, JS::HandleObject moduleRecord); extern JS_PUBLIC_API(JSScript*) GetModuleScript(JSContext* cx, JS::HandleObject moduleRecord); +extern JS_PUBLIC_API(bool) +IsModuleErrored(JSObject* moduleRecord); + +extern JS_PUBLIC_API(JS::Value) +GetModuleError(JSObject* moduleRecord); + } /* namespace JS */ extern JS_PUBLIC_API(bool) -- cgit v1.2.3 From ef8d18da70c2c2efedc5e4db1dca0ece30ac5d14 Mon Sep 17 00:00:00 2001 From: Moonchild Date: Fri, 3 Jul 2020 14:21:27 +0000 Subject: Issue #618 - Match JSAPI names with the changes in 9ca74147225eed305e28c7887f9b2251aeeb0f36 Ref: BZ 1388728 --- js/src/jsapi.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'js/src/jsapi.h') diff --git a/js/src/jsapi.h b/js/src/jsapi.h index 5e0259587..9c3bf8151 100644 --- a/js/src/jsapi.h +++ b/js/src/jsapi.h @@ -4356,28 +4356,27 @@ extern JS_PUBLIC_API(JS::Value) GetModuleHostDefinedField(JSObject* module); /* - * Perform the ModuleDeclarationInstantiation operation on on the give source - * text module record. + * Perform the ModuleInstantiate operation on the given source text module + * record. * * This transitively resolves all module dependencies (calling the * HostResolveImportedModule hook) and initializes the environment record for * the module. */ extern JS_PUBLIC_API(bool) -ModuleDeclarationInstantiation(JSContext* cx, JS::HandleObject moduleRecord); +ModuleInstantiate(JSContext* cx, JS::HandleObject moduleRecord); /* - * Perform the ModuleEvaluation operation on on the give source text module - * record. + * Perform the ModuleEvaluate operation on the given source text module record. * * This does nothing if this module has already been evaluated. Otherwise, it * transitively evaluates all dependences of this module and then evaluates this * module. * - * ModuleDeclarationInstantiation must have completed prior to calling this. + * ModuleInstantiate must have completed prior to calling this. */ extern JS_PUBLIC_API(bool) -ModuleEvaluation(JSContext* cx, JS::HandleObject moduleRecord); +ModuleEvaluate(JSContext* cx, JS::HandleObject moduleRecord); /* * Get a list of the module specifiers used by a source text module -- cgit v1.2.3 From 765c90318f192ba18848095133b0531c3162678d Mon Sep 17 00:00:00 2001 From: Moonchild Date: Fri, 3 Jul 2020 15:59:00 +0000 Subject: Issue #618 - Fix JSAPI additions to pass the JS context. --- js/src/jsapi.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'js/src/jsapi.h') diff --git a/js/src/jsapi.h b/js/src/jsapi.h index 9c3bf8151..6d306edc5 100644 --- a/js/src/jsapi.h +++ b/js/src/jsapi.h @@ -4396,10 +4396,10 @@ extern JS_PUBLIC_API(JSScript*) GetModuleScript(JSContext* cx, JS::HandleObject moduleRecord); extern JS_PUBLIC_API(bool) -IsModuleErrored(JSObject* moduleRecord); +IsModuleErrored(JSContext* cx, JSObject* moduleRecord); extern JS_PUBLIC_API(JS::Value) -GetModuleError(JSObject* moduleRecord); +GetModuleError(JSContext* cx, JSObject* moduleRecord); } /* namespace JS */ -- cgit v1.2.3 From 40aad1a2209607b973170f4fb64548e5d8103402 Mon Sep 17 00:00:00 2001 From: Moonchild Date: Sat, 4 Jul 2020 12:59:38 +0000 Subject: Issue #618 - Remove context and heap-idle check For checking if a module is in an error state and what the error is, it shouldn't matter if we are currently GC-ing or not. So we don't need to check for it, which removes the requirement to pass in the JS context (needed for AssertHeapIsIdle's runtime check); this unblocks progress where otherwise we'd have to figure out what the context is at the module level just to satisfy this check. --- js/src/jsapi.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'js/src/jsapi.h') diff --git a/js/src/jsapi.h b/js/src/jsapi.h index 6d306edc5..9c3bf8151 100644 --- a/js/src/jsapi.h +++ b/js/src/jsapi.h @@ -4396,10 +4396,10 @@ extern JS_PUBLIC_API(JSScript*) GetModuleScript(JSContext* cx, JS::HandleObject moduleRecord); extern JS_PUBLIC_API(bool) -IsModuleErrored(JSContext* cx, JSObject* moduleRecord); +IsModuleErrored(JSObject* moduleRecord); extern JS_PUBLIC_API(JS::Value) -GetModuleError(JSContext* cx, JSObject* moduleRecord); +GetModuleError(JSObject* moduleRecord); } /* namespace JS */ -- cgit v1.2.3