corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

8
js/src/jsobj.cpp
View File

@@ -1657,7 +1657,7 @@ js_InferFlags(JSContext *cx, unsigned defaultFlags)
JSObject::nonNativeSetProperty(JSContext *cx, HandleObject obj,
HandleId id, MutableHandleValue vp, bool strict)
{
if (JS_UNLIKELY(obj->watched())) {
if (MOZ_UNLIKELY(obj->watched())) {
WatchpointMap *wpmap = cx->compartment()->watchpointMap;
if (wpmap && !wpmap->triggerWatchpoint(cx, obj, id, vp))
return false;
@@ -1669,7 +1669,7 @@ JSObject::nonNativeSetProperty(JSContext *cx, HandleObject obj,
JSObject::nonNativeSetElement(JSContext *cx, HandleObject obj,
uint32_t index, MutableHandleValue vp, bool strict)
{
if (JS_UNLIKELY(obj->watched())) {
if (MOZ_UNLIKELY(obj->watched())) {
RootedId id(cx);
if (!IndexToId(cx, index, &id))
return false;
@@ -4874,7 +4874,7 @@ baseops::SetPropertyHelper(typename ExecutionModeTraits<mode>::ContextType cxArg
JS_ASSERT(cxArg->isThreadLocal(obj));
JS_ASSERT((defineHow & ~DNP_UNQUALIFIED) == 0);
if (JS_UNLIKELY(obj->watched())) {
if (MOZ_UNLIKELY(obj->watched())) {
if (mode == ParallelExecution)
return false;
@@ -5924,7 +5924,7 @@ JSObject::addSizeOfExcludingThis(mozilla::MallocSizeOf mallocSizeOf, JS::Objects
if (hasDynamicElements()) {
js::ObjectElements *elements = getElementsHeader();
if (JS_UNLIKELY(elements->isAsmJSArrayBuffer())) {
if (MOZ_UNLIKELY(elements->isAsmJSArrayBuffer())) {
#if defined (JS_CPU_X64)
// On x64, ArrayBufferObject::prepareForAsmJS switches the
// ArrayBufferObject to use mmap'd storage.