Bug 975277 - Followup bustage fix for the very recent removal of shortId. r=me CLOSED TREE
authorBobby Holley <bobbyholley@gmail.com>
Fri, 21 Feb 2014 16:22:48 -0800
changeset 170340 924690f9d81b677ab55fa2d52aee828b4191398f
parent 170339 84904662e2d567085b5c63f57aa2db45580940db
child 170341 ef1429315d28e9d07feb7131d47fedab43f3d1e3
push id270
push userpvanderbeken@mozilla.com
push dateThu, 06 Mar 2014 09:24:21 +0000
reviewersme
bugs975277
milestone30.0a1
Bug 975277 - Followup bustage fix for the very recent removal of shortId. r=me CLOSED TREE
js/src/jsproxy.cpp
--- a/js/src/jsproxy.cpp
+++ b/js/src/jsproxy.cpp
@@ -2550,17 +2550,17 @@ Proxy::set(JSContext *cx, HandleObject p
         return handler->set(cx, proxy, receiver, id, strict, vp);
 
     // If we have an existing (own or non-own) property with a setter, we want
     // to invoke that.
     Rooted<PropertyDescriptor> desc(cx);
     if (!Proxy::getPropertyDescriptor(cx, proxy, id, &desc, JSRESOLVE_ASSIGNING))
         return false;
     if (desc.object() && desc.setter() && desc.setter() != JS_StrictPropertyStub)
-        return CallSetter(cx, receiver, id, desc.setter(), desc.attributes(), desc.shortid(), strict, vp);
+        return CallSetter(cx, receiver, id, desc.setter(), desc.attributes(), strict, vp);
 
     // Ok. Either there was no pre-existing property, or it was a value prop
     // that we're going to shadow. Make a property descriptor and define it.
     Rooted<PropertyDescriptor> newDesc(cx);
     newDesc.value().set(vp);
     return handler->defineProperty(cx, receiver, id, &newDesc);
 }