Bug 828248 - Part f: Pass MutableHandleId to ValueIsSpecial; r=sfink

js/src/builtin/ParallelArray.cpp

@@ -1830,7 +1830,7 @@ ParallelArrayObject::getGeneric(JSContext *cx, HandleObject obj, HandleObject re
         return getElement(cx, obj, receiver, index, vp);
 
     Rooted<SpecialId> sid(cx);
-    if (ValueIsSpecial(obj, &idval, sid.address(), cx))
+    if (ValueIsSpecial(obj, &idval, &sid, cx))
         return getSpecial(cx, obj, receiver, sid, vp);
 
     JSAtom *atom = ToAtom(cx, idval);

js/src/jsarray.cpp

@@ -791,7 +791,7 @@ array_getGeneric(JSContext *cx, HandleObject obj, HandleObject receiver, HandleI
         return array_getElement(cx, obj, receiver, index, vp);
 
     Rooted<SpecialId> sid(cx);
-    if (ValueIsSpecial(obj, &idval, sid.address(), cx))
+    if (ValueIsSpecial(obj, &idval, &sid, cx))
         return array_getSpecial(cx, obj, receiver, sid, vp);
 
     JSAtom *atom = ToAtom(cx, idval);

js/src/jsinterpinlines.h

@@ -767,7 +767,7 @@ GetObjectElementOperation(JSContext *cx, JSOp op, HandleObject obj, const Value
             }
         }
 
-        SpecialId special;
+        Rooted<SpecialId> special(cx);
         res.set(rref);
         if (ValueIsSpecial(obj, res, &special, cx)) {
             if (!JSObject::getSpecial(cx, obj, obj, special, res))

js/src/jsobj.cpp

@@ -1565,7 +1565,7 @@ JSObject::deleteByValue(JSContext *cx, HandleObject obj,
 
     RootedValue propval(cx, property);
     Rooted<SpecialId> sid(cx);
-    if (ValueIsSpecial(obj, &propval, sid.address(), cx))
+    if (ValueIsSpecial(obj, &propval, &sid, cx))
         return deleteSpecial(cx, obj, sid, rval, strict);
 
     JSAtom *name = ToAtom(cx, propval);

js/src/jsobjinlines.h

@@ -1631,14 +1631,15 @@ IsObjectWithClass(const Value &v, ESClassValue classValue, JSContext *cx)
 }
 
 static JS_ALWAYS_INLINE bool
-ValueIsSpecial(JSObject *obj, MutableHandleValue propval, SpecialId *sidp, JSContext *cx)
+ValueIsSpecial(JSObject *obj, MutableHandleValue propval, MutableHandle<SpecialId> sidp,
+               JSContext *cx)
 {
 #if JS_HAS_XML_SUPPORT
     if (!propval.isObject())
         return false;
 
     if (obj->isXML()) {
-        *sidp = SpecialId(propval.toObject());
+        sidp.set(SpecialId(propval.toObject()));
         return true;
     }
 

js/src/jstypedarray.cpp

@@ -1283,7 +1283,7 @@ class TypedArrayTemplate
             return obj_getElement(cx, obj, receiver, index, vp);
 
         Rooted<SpecialId> sid(cx);
-        if (ValueIsSpecial(obj, &idval, sid.address(), cx))
+        if (ValueIsSpecial(obj, &idval, &sid, cx))
             return obj_getSpecial(cx, obj, receiver, sid, vp);
 
         JSAtom *atom = ToAtom(cx, idval);