Backed out changeset 77117d1570b1 (bug 1165053)
authorTooru Fujisawa <arai_a@mac.com>
Mon, 28 Mar 2016 06:49:57 +0900
changeset 290677 b62e02bd33f9e6852fa629b8e8f3a1c6d9b3c05e
parent 290676 90a83b5f5f0503a442236c4dddabc199efc5663c
child 290678 8b4dc7fe55213d623cb903a9ae941b0c55b4ceca
push id19656
push usergwagner@mozilla.com
push dateMon, 04 Apr 2016 13:43:23 +0000
treeherderb2g-inbound@e99061fde28a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1165053
milestone48.0a1
backs out77117d1570b1b653d0b6b497f95a5a6a1bc442f2
Backed out changeset 77117d1570b1 (bug 1165053)
js/src/jsobj.cpp
js/src/jsobj.h
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -2368,49 +2368,16 @@ js::GetPropertyPure(ExclusiveContext* cx
     if (!shape) {
         vp->setUndefined();
         return true;
     }
 
     return pobj->isNative() && NativeGetPureInline(&pobj->as<NativeObject>(), shape, vp);
 }
 
-static inline bool
-NativeGetGetterPureInline(NativeObject* pobj, Shape* shape, JSFunction** fp)
-{
-    if (shape->hasGetterObject()) {
-        if (shape->getterObject()->is<JSFunction>()) {
-            *fp = &shape->getterObject()->as<JSFunction>();
-            return true;
-        }
-    }
-
-    *fp = nullptr;
-    return true;
-}
-
-bool
-js::GetGetterPure(ExclusiveContext* cx, JSObject* obj, jsid id, JSFunction** fp)
-{
-    /* Just like GetPropertyPure, but get getter function, without invoking
-     * it. */
-    JSObject* pobj;
-    Shape* shape;
-    if (!LookupPropertyPure(cx, obj, id, &pobj, &shape))
-        return false;
-
-    if (!shape) {
-        *fp = nullptr;
-        return true;
-    }
-
-    return pobj->isNative() &&
-           NativeGetGetterPureInline(&pobj->as<NativeObject>(), shape, fp);
-}
-
 bool
 JSObject::reportReadOnly(JSContext* cx, jsid id, unsigned report)
 {
     RootedValue val(cx, IdToValue(id));
     return ReportValueErrorFlags(cx, report, JSMSG_READ_ONLY,
                                  JSDVG_IGNORE_STACK, val, nullptr,
                                  nullptr, nullptr);
 }
--- a/js/src/jsobj.h
+++ b/js/src/jsobj.h
@@ -1214,19 +1214,16 @@ FindVariableScope(JSContext* cx, JSFunct
 bool
 LookupPropertyPure(ExclusiveContext* cx, JSObject* obj, jsid id, JSObject** objp,
                    Shape** propp);
 
 bool
 GetPropertyPure(ExclusiveContext* cx, JSObject* obj, jsid id, Value* vp);
 
 bool
-GetGetterPure(ExclusiveContext* cx, JSObject* obj, jsid id, JSFunction** fp);
-
-bool
 GetOwnPropertyDescriptor(JSContext* cx, HandleObject obj, HandleId id,
                          MutableHandle<PropertyDescriptor> desc);
 
 bool
 GetOwnPropertyDescriptor(JSContext* cx, HandleObject obj, HandleId id, MutableHandleValue vp);
 
 /*
  * ES6 draft rev 32 (2015 Feb 2) 6.2.4.4 FromPropertyDescriptor(Desc).