Bug 829087 - Handlify jsids in IonCache. r=terrence
authorTom Schuster <evilpies@gmail.com>
Fri, 11 Jan 2013 16:47:07 +0100
changeset 118577 bf379a4b7234ce841b9e1a8ccf1b7bcfb1c7d531
parent 118576 1803280504e73cbf9e14f2fe3dd5e1914c71bf06
child 118578 2bfc7fb79f781cfb2b59b6ed451c49372b0896af
push id21144
push userevilpies@gmail.com
push dateFri, 11 Jan 2013 15:47:42 +0000
treeherdermozilla-inbound@bf379a4b7234 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersterrence
bugs829087
milestone21.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 829087 - Handlify jsids in IonCache. r=terrence
js/src/ion/IonCaches.cpp
--- a/js/src/ion/IonCaches.cpp
+++ b/js/src/ion/IonCaches.cpp
@@ -1418,17 +1418,17 @@ IsPropertySetInlineable(JSContext *cx, H
 
     pshape.set(shape);
 
     return true;
 }
 
 static bool
 IsPropertySetterCallInlineable(JSContext *cx, HandleObject obj, HandleObject holder,
-                               jsid id, HandleShape shape)
+                               HandleShape shape)
 {
     if (!shape)
         return false;
 
     if (shape->hasSlot())
         return false;
 
     if (shape->hasDefaultSetter())
@@ -1441,17 +1441,17 @@ IsPropertySetterCallInlineable(JSContext
     // (which implies JSNative setter).
     if (shape->hasSetterValue())
         return false;
 
     return true;
 }
 
 static bool
-IsPropertyAddInlineable(JSContext *cx, HandleObject obj, jsid id, uint32_t oldSlots,
+IsPropertyAddInlineable(JSContext *cx, HandleObject obj, HandleId id, uint32_t oldSlots,
                         MutableHandleShape pShape)
 {
     // This is not a Add, the property exists.
     if (pShape.get())
         return false;
 
     RootedShape shape(cx, obj->nativeLookup(cx, id));
     if (!shape || shape->inDictionary() || !shape->hasSlot() || !shape->hasDefaultSetter())
@@ -1518,17 +1518,17 @@ js::ion::SetPropertyCache(JSContext *cx,
             if (!cache.attachNativeExisting(cx, ion, obj, shape))
                 return false;
             addedSetterStub = true;
         } else {
             RootedObject holder(cx);
             if (!JSObject::lookupProperty(cx, obj, name, &holder, &shape))
                 return false;
 
-            if (IsPropertySetterCallInlineable(cx, obj, holder, id, shape)) {
+            if (IsPropertySetterCallInlineable(cx, obj, holder, shape)) {
                 cache.incrementStubCount();
                 if (!cache.attachSetterCall(cx, ion, obj, holder, shape, returnAddr))
                     return false;
                 addedSetterStub = true;
             }
         }
     }