diff options
| author | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-03-17 16:56:31 +0100 |
|---|---|---|
| committer | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-03-17 16:56:31 +0100 |
| commit | 0a815a6f1117caa829937b5ad8e306481a9f896d (patch) | |
| tree | a656db3e35eea6277674e18e896474628dc0b50f /js/src/vm/GlobalObject.h | |
| parent | a24511ca8e19afe4d19008ba903e1edab0af3223 (diff) | |
| download | UXP-0a815a6f1117caa829937b5ad8e306481a9f896d.tar UXP-0a815a6f1117caa829937b5ad8e306481a9f896d.tar.gz UXP-0a815a6f1117caa829937b5ad8e306481a9f896d.tar.lz UXP-0a815a6f1117caa829937b5ad8e306481a9f896d.tar.xz UXP-0a815a6f1117caa829937b5ad8e306481a9f896d.zip | |
Use ordinary objects for Error prototypes
Diffstat (limited to 'js/src/vm/GlobalObject.h')
| -rw-r--r-- | js/src/vm/GlobalObject.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/js/src/vm/GlobalObject.h b/js/src/vm/GlobalObject.h index 05984bc5f..3534ef2f6 100644 --- a/js/src/vm/GlobalObject.h +++ b/js/src/vm/GlobalObject.h @@ -427,6 +427,18 @@ class GlobalObject : public NativeObject return &global->getPrototype(key).toObject(); } + static JSFunction* + getOrCreateErrorConstructor(JSContext* cx, Handle<GlobalObject*> global) { + if (!ensureConstructor(cx, global, JSProto_Error)) + return nullptr; + return &global->getConstructor(JSProto_Error).toObject().as<JSFunction>(); + } + + static JSObject* + getOrCreateErrorPrototype(JSContext* cx, Handle<GlobalObject*> global) { + return getOrCreateCustomErrorPrototype(cx, global, JSEXN_ERR); + } + static NativeObject* getOrCreateSetPrototype(JSContext* cx, Handle<GlobalObject*> global) { if (!ensureConstructor(cx, global, JSProto_Set)) return nullptr; @@ -1003,10 +1015,7 @@ GenericCreatePrototype(JSContext* cx, JSProtoKey key) inline JSProtoKey StandardProtoKeyOrNull(const JSObject* obj) { - JSProtoKey key = JSCLASS_CACHED_PROTO_KEY(obj->getClass()); - if (key == JSProto_Error) - return GetExceptionProtoKey(obj->as<ErrorObject>().type()); - return key; + return JSCLASS_CACHED_PROTO_KEY(obj->getClass()); } JSObject* |