Backed out changeset 043c91e3aaeb (bug 1042567) for debug jsreftest failures.
authorRyan VanderMeulen <ryanvm@gmail.com>
Sun, 26 Oct 2014 20:08:26 -0400
changeset 225827 15bafc2978d8
parent 225826 080cfa7f5d79
child 225828 5a4dfee44717
push id4028
push userryanvm@gmail.com
push date2014-10-27 00:08 +0000
treeherdermozilla-beta@15bafc2978d8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1042567
milestone34.0
backs out043c91e3aaeb
Backed out changeset 043c91e3aaeb (bug 1042567) for debug jsreftest failures.
js/src/jsobj.cpp
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -376,28 +376,21 @@ js::GetOwnPropertyDescriptor(JSContext *
         desc.object().set(nullptr);
         return true;
     }
 
     bool doGet = true;
     if (pobj->isNative()) {
         desc.setAttributes(GetShapeAttributes(pobj, shape));
         if (desc.hasGetterOrSetterObject()) {
-            MOZ_ASSERT(desc.isShared());
             doGet = false;
             if (desc.hasGetterObject())
                 desc.setGetterObject(shape->getterObject());
             if (desc.hasSetterObject())
                 desc.setSetterObject(shape->setterObject());
-        } else {
-            // This is either a straight-up data property or (rarely) a
-            // property with a JSPropertyOp getter/setter. The latter must be
-            // reported to the caller as a plain data property, so don't
-            // populate desc.getter/setter, and mask away the SHARED bit.
-            desc.attributesRef() &= ~JSPROP_SHARED;
         }
     } else {
         if (!JSObject::getGenericAttributes(cx, pobj, id, &desc.attributesRef()))
             return false;
     }
 
     RootedValue value(cx);
     if (doGet && !JSObject::getGeneric(cx, obj, obj, id, &value))