Backed out changeset b77cb94666ca (bug 887016)
authorTooru Fujisawa <arai_a@mac.com>
Mon, 28 Mar 2016 06:49:55 +0900
changeset 290656 ecba6c9f0bc38ece3305da035d43ffedd111bbab
parent 290655 2081fb1b83a1dc8f1ba34fcf11bca7e621e20b9d
child 290657 dd34be112501af92dcaf4f4f24e7f67a7ceaaf7e
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)
bugs887016
milestone48.0a1
backs outb77cb94666ca383ff7586997aa820b692794f557
Backed out changeset b77cb94666ca (bug 887016)
js/src/jsobj.cpp
js/src/jsobj.h
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -2447,28 +2447,16 @@ js::GetOwnNativeGetterPure(JSContext* cx
     if (!getter->isNative())
         return true;
 
     *native = getter->native();
     return true;
 }
 
 bool
-js::HasOwnDataPropertyPure(JSContext* cx, JSObject* obj, jsid id, bool* result)
-{
-    Shape* shape = nullptr;
-    if (!LookupOwnPropertyPure(cx, obj, id, &shape))
-        return false;
-
-    *result = shape && !IsImplicitDenseOrTypedArrayElement(shape) && shape->hasDefaultGetter() &&
-              shape->hasSlot();
-    return true;
-}
-
-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
@@ -1224,19 +1224,16 @@ GetPropertyPure(ExclusiveContext* cx, JS
 
 bool
 GetGetterPure(ExclusiveContext* cx, JSObject* obj, jsid id, JSFunction** fp);
 
 bool
 GetOwnNativeGetterPure(JSContext* cx, JSObject* obj, jsid id, JSNative* native);
 
 bool
-HasOwnDataPropertyPure(JSContext* cx, JSObject* obj, jsid id, bool* result);
-
-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).