diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-07-04 12:59:38 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-07-10 18:30:39 +0000 |
| commit | 40aad1a2209607b973170f4fb64548e5d8103402 (patch) | |
| tree | 297fcf9b8cd836436393f612e84bf843aa0da1b6 /js/src | |
| parent | 1e14031a5940f6846f6ecce1b3c889b6a3d9b67a (diff) | |
| download | uxp-40aad1a2209607b973170f4fb64548e5d8103402.tar.gz | |
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.
Diffstat (limited to 'js/src')
| -rw-r--r-- | js/src/jsapi.cpp | 8 | ||||
| -rw-r--r-- | js/src/jsapi.h | 4 |
2 files changed, 4 insertions, 8 deletions
diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp index cb0851f80b..cf5880e038 100644 --- a/js/src/jsapi.cpp +++ b/js/src/jsapi.cpp @@ -4740,18 +4740,14 @@ JS::GetModuleScript(JSContext* cx, JS::HandleObject moduleArg) } JS_PUBLIC_API(bool) -JS::IsModuleErrored(JSContext* cx, JSObject* moduleArg) +JS::IsModuleErrored(JSObject* moduleArg) { - AssertHeapIsIdle(cx); - CHECK_REQUEST(cx); return moduleArg->as<ModuleObject>().status() == MODULE_STATUS_ERRORED; } JS_PUBLIC_API(JS::Value) -JS::GetModuleError(JSContext* cx, JSObject* moduleArg) +JS::GetModuleError(JSObject* moduleArg) { - AssertHeapIsIdle(cx); - CHECK_REQUEST(cx); return moduleArg->as<ModuleObject>().error(); } diff --git a/js/src/jsapi.h b/js/src/jsapi.h index 6d306edc56..9c3bf81518 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 */ |