Bug 807168 - Followup to fix an issue building on ancient GCC on a CLOSED TREE; r=Waldo
authorTerrence Cole <terrence@mozilla.com>
Fri, 18 Apr 2014 11:19:16 -0700
changeset 179659 fce80dedac0be5d09904015aa8672558bd069d8e
parent 179658 e3587048a9fd30b6d602185e0a634b8a1ba3b863
child 179660 5d9fb05d9d12399f0a1ba7df55fbb8d2e38ab844
push id272
push userpvanderbeken@mozilla.com
push dateMon, 05 May 2014 16:31:18 +0000
reviewersWaldo
bugs807168
milestone31.0a1
Bug 807168 - Followup to fix an issue building on ancient GCC on a CLOSED TREE; r=Waldo
js/src/gc/Verifier.cpp
--- a/js/src/gc/Verifier.cpp
+++ b/js/src/gc/Verifier.cpp
@@ -190,17 +190,17 @@ gc::StartVerifyPreBarriers(JSRuntime *rt
     if (!IsIncrementalGCSafe(rt))
         return;
 
     for (GCChunkSet::Range r(rt->gcChunkSet.all()); !r.empty(); r.popFront())
         r.front()->bitmap.clear();
 
     rt->gcNumber++;
 
-    VerifyPreTracer *trc = js_new<VerifyPreTracer>(rt, nullptr);
+    VerifyPreTracer *trc = js_new<VerifyPreTracer>(rt, JSTraceCallback(nullptr));
     if (!trc)
         return;
 
     /*
      * Passing a function pointer directly to js_new trips a compiler bug in
      * MSVC. Work around by filling the pointer after allocating with nullptr.
      */
     trc->setTraceCallback(AccumulateEdge);
@@ -407,17 +407,17 @@ gc::StartVerifyPostBarriers(JSRuntime *r
     {
         return;
     }
 
     MinorGC(rt, JS::gcreason::EVICT_NURSERY);
 
     rt->gcNumber++;
 
-    VerifyPostTracer *trc = js_new<VerifyPostTracer>(rt, nullptr);
+    VerifyPostTracer *trc = js_new<VerifyPostTracer>(rt, JSTraceCallback(nullptr));
     if (!trc)
         return;
 
     rt->gcVerifyPostData = trc;
 #endif
 }
 
 #ifdef JSGC_GENERATIONAL