Fix merge bustage.
authorDavid Anderson <danderson@mozilla.com>
Wed, 08 Feb 2012 19:30:47 -0800
changeset 112673 ff9351290e23bfb17b90bc58aec8c67169556907
parent 112672 151228e4adeb28caecb40a2aa09b3bd3b9b517cc
child 112674 a32462495d865e9d05fa5c0b3b939e4384ba982f
push id239
push userakeybl@mozilla.com
push dateThu, 03 Jan 2013 21:54:43 +0000
treeherdermozilla-release@3a7b66445659 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone13.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
Fix merge bustage.
js/src/ion/Ion.cpp
js/src/jsgc.cpp
js/src/jsgcmark.h
--- a/js/src/ion/Ion.cpp
+++ b/js/src/ion/Ion.cpp
@@ -195,29 +195,29 @@ IonCompartment::mark(JSTracer *trc, JSCo
 
     // functionWrappers_ are not marked because this is a WeakCache of VM
     // function implementations.
 }
 
 void
 IonCompartment::sweep(JSContext *cx)
 {
-    if (enterJIT_ && IsAboutToBeFinalized(cx, enterJIT_))
+    if (enterJIT_ && IsAboutToBeFinalized(enterJIT_))
         enterJIT_ = NULL;
-    if (osrPrologue_ && IsAboutToBeFinalized(cx, osrPrologue_))
+    if (osrPrologue_ && IsAboutToBeFinalized(osrPrologue_))
         osrPrologue_ = NULL;
-    if (bailoutHandler_ && IsAboutToBeFinalized(cx, bailoutHandler_))
+    if (bailoutHandler_ && IsAboutToBeFinalized(bailoutHandler_))
         bailoutHandler_ = NULL;
-    if (argumentsRectifier_ && IsAboutToBeFinalized(cx, argumentsRectifier_))
+    if (argumentsRectifier_ && IsAboutToBeFinalized(argumentsRectifier_))
         argumentsRectifier_ = NULL;
-    if (invalidator_ && IsAboutToBeFinalized(cx, invalidator_))
+    if (invalidator_ && IsAboutToBeFinalized(invalidator_))
         invalidator_ = NULL;
 
     for (size_t i = 0; i < bailoutTables_.length(); i++) {
-        if (bailoutTables_[i] && IsAboutToBeFinalized(cx, bailoutTables_[i]))
+        if (bailoutTables_[i] && IsAboutToBeFinalized(bailoutTables_[i]))
             bailoutTables_[i] = NULL;
     }
 
     // Sweep cache of VM function implementations.
     functionWrappers_->sweep(cx);
 }
 
 IonCode *
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -857,16 +857,18 @@ IsAboutToBeFinalized(const Cell *thing)
     return !reinterpret_cast<const Cell *>(thing)->isMarked();
 }
 
 bool
 IsAboutToBeFinalized(const Value &v)
 {
     JS_ASSERT(v.isMarkable());
     return IsAboutToBeFinalized((Cell *)v.toGCThing());
+}
+
 /* Lifetime for type sets attached to scripts containing observed types. */
 static const int64_t JIT_SCRIPT_RELEASE_TYPES_INTERVAL = 60 * 1000 * 1000;
 
 JSBool
 js_InitGC(JSRuntime *rt, uint32_t maxbytes)
 {
     if (!rt->gcChunkSet.init(INITIAL_CHUNK_CAPACITY))
         return false;
--- a/js/src/jsgcmark.h
+++ b/js/src/jsgcmark.h
@@ -255,17 +255,17 @@ inline bool
 IsMarked(JSObject *o)
 {
     return !IsAboutToBeFinalized(o);
 }
 
 inline bool
 IsMarked(JSContext *cx, ion::IonCode *code)
 {
-    return !IsAboutToBeFinalized(cx, code);
+    return !IsAboutToBeFinalized(code);
 }
 
 inline bool
 IsMarked(Cell *cell)
 {
     return !IsAboutToBeFinalized(cell);
 }