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 187219 924690f9d81b677ab55fa2d52aee828b4191398f
parent 187218 84904662e2d567085b5c63f57aa2db45580940db
child 187220 ef1429315d28e9d07feb7131d47fedab43f3d1e3
push id3503
push userraliiev@mozilla.com
push dateMon, 28 Apr 2014 18:51:11 +0000
treeherdermozilla-beta@c95ac01e332e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs975277
milestone30.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
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);
 }