Bug 964016 - Part 2: Replace JS_UNLIKELY with MOZ_UNLIKELY. r=luke

This commit is contained in:
Chris Peterson
2014-01-24 19:57:58 -08:00
parent 160d063513
commit c49c31dada
26 changed files with 53 additions and 81 deletions

View File

@@ -101,13 +101,13 @@ Enumerate(JSContext *cx, HandleObject pobj, jsid id,
* the built-in prototypes). So exclude __proto__ if the object where the
* property was found has no [[Prototype]] and might be |Object.prototype|.
*/
if (JS_UNLIKELY(!pobj->getTaggedProto().isObject() && JSID_IS_ATOM(id, cx->names().proto)))
if (MOZ_UNLIKELY(!pobj->getTaggedProto().isObject() && JSID_IS_ATOM(id, cx->names().proto)))
return true;
if (!(flags & JSITER_OWNONLY) || pobj->is<ProxyObject>() || pobj->getOps()->enumerate) {
/* If we've already seen this, we definitely won't add it. */
IdSet::AddPtr p = ht.lookupForAdd(id);
if (JS_UNLIKELY(!!p))
if (MOZ_UNLIKELY(!!p))
return true;
/*