author | Tom Schuster <evilpies@gmail.com> |
Fri, 03 Apr 2015 21:23:22 +0200 | |
changeset 237573 | 8dce32099811ce6baa7bf141ba9b4c90a46ce635 |
parent 237572 | 90c5d1cc12a8527befe209929c023d427e7e672d |
child 237574 | 3aea48a423be9e726ccb22586ff6047439dd699a |
push id | 28540 |
push user | philringnalda@gmail.com |
push date | Sat, 04 Apr 2015 17:42:19 +0000 |
treeherder | mozilla-central@035959eef3f9 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | luke |
bugs | 1125302 |
milestone | 40.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/js/src/jsobj.cpp +++ b/js/src/jsobj.cpp @@ -2632,17 +2632,17 @@ js::LookupProperty(JSContext* cx, Handle MutableHandleObject objp, MutableHandleShape propp) { /* NB: The logic of lookupProperty is implicitly reflected in * BaselineIC.cpp's |EffectlesslyLookupProperty| logic. * If this changes, please remember to update the logic there as well. */ if (LookupPropertyOp op = obj->getOps()->lookupProperty) return op(cx, obj, id, objp, propp); - return NativeLookupProperty<CanGC>(cx, obj.as<NativeObject>(), id, objp, propp); + return LookupPropertyInline<CanGC>(cx, obj.as<NativeObject>(), id, objp, propp); } bool js::LookupName(JSContext* cx, HandlePropertyName name, HandleObject scopeChain, MutableHandleObject objp, MutableHandleObject pobjp, MutableHandleShape propp) { RootedId id(cx, NameToId(name));
--- a/js/src/vm/NativeObject-inl.h +++ b/js/src/vm/NativeObject-inl.h @@ -572,24 +572,16 @@ LookupPropertyInline(ExclusiveContext* c } objp.set(nullptr); propp.set(nullptr); return true; } inline bool -NativeLookupProperty(ExclusiveContext* cx, HandleNativeObject obj, PropertyName* name, - MutableHandleObject objp, MutableHandleShape propp) -{ - RootedId id(cx, NameToId(name)); - return NativeLookupProperty<CanGC>(cx, obj, id, objp, propp); -} - -inline bool WarnIfNotConstructing(JSContext* cx, const CallArgs& args, const char* builtinName) { if (args.isConstructing()) return true; return JS_ReportErrorFlagsAndNumber(cx, JSREPORT_WARNING, GetErrorMessage, nullptr, JSMSG_BUILTIN_CTOR_NO_NEW, builtinName); }
--- a/js/src/vm/NativeObject.cpp +++ b/js/src/vm/NativeObject.cpp @@ -1004,48 +1004,16 @@ js::NativeLookupOwnProperty(ExclusiveCon template bool js::NativeLookupOwnProperty<CanGC>(ExclusiveContext* cx, HandleNativeObject obj, HandleId id, MutableHandleShape propp); template bool js::NativeLookupOwnProperty<NoGC>(ExclusiveContext* cx, NativeObject* obj, jsid id, FakeMutableHandle<Shape*> propp); -template <AllowGC allowGC> -bool -js::NativeLookupProperty(ExclusiveContext* cx, - typename MaybeRooted<NativeObject*, allowGC>::HandleType obj, - typename MaybeRooted<jsid, allowGC>::HandleType id, - typename MaybeRooted<JSObject*, allowGC>::MutableHandleType objp, - typename MaybeRooted<Shape*, allowGC>::MutableHandleType propp) -{ - return LookupPropertyInline<allowGC>(cx, obj, id, objp, propp); -} - -template bool -js::NativeLookupProperty<CanGC>(ExclusiveContext* cx, HandleNativeObject obj, HandleId id, - MutableHandleObject objp, MutableHandleShape propp); - -template bool -js::NativeLookupProperty<NoGC>(ExclusiveContext* cx, NativeObject* obj, jsid id, - FakeMutableHandle<JSObject*> objp, - FakeMutableHandle<Shape*> propp); - -bool -js::NativeLookupElement(JSContext* cx, HandleNativeObject obj, uint32_t index, - MutableHandleObject objp, MutableHandleShape propp) -{ - RootedId id(cx); - if (!IndexToId(cx, index, &id)) - return false; - - return LookupPropertyInline<CanGC>(cx, obj, id, objp, propp); -} - - /*** [[DefineOwnProperty]] ***********************************************************************/ static inline bool CallAddPropertyHook(ExclusiveContext* cx, HandleNativeObject obj, HandleShape shape, HandleValue value) { if (JSAddPropertyOp addProperty = obj->getClass()->addProperty) { if (!cx->shouldBeJSContext())
--- a/js/src/vm/NativeObject.h +++ b/js/src/vm/NativeObject.h @@ -1347,37 +1347,16 @@ NativeDeleteProperty(JSContext* cx, Hand template <AllowGC allowGC> extern bool NativeLookupOwnProperty(ExclusiveContext* cx, typename MaybeRooted<NativeObject*, allowGC>::HandleType obj, typename MaybeRooted<jsid, allowGC>::HandleType id, typename MaybeRooted<Shape*, allowGC>::MutableHandleType propp); /* - * On success, and if id was found, return true with *objp non-null and with a - * property of *objp stored in *propp. If successful but id was not found, - * return true with both *objp and *propp null. - */ -template <AllowGC allowGC> -extern bool -NativeLookupProperty(ExclusiveContext* cx, - typename MaybeRooted<NativeObject*, allowGC>::HandleType obj, - typename MaybeRooted<jsid, allowGC>::HandleType id, - typename MaybeRooted<JSObject*, allowGC>::MutableHandleType objp, - typename MaybeRooted<Shape*, allowGC>::MutableHandleType propp); - -inline bool -NativeLookupProperty(ExclusiveContext* cx, HandleNativeObject obj, PropertyName* name, - MutableHandleObject objp, MutableHandleShape propp); - -extern bool -NativeLookupElement(JSContext* cx, HandleNativeObject obj, uint32_t index, - MutableHandleObject objp, MutableHandleShape propp); - -/* * Get a property from `receiver`, after having already done a lookup and found * the property on a native object `obj`. * * `shape` must not be null and must not be an implicit dense property. It must * be present in obj's shape chain. */ extern bool NativeGetExistingProperty(JSContext* cx, HandleObject receiver, HandleNativeObject obj,