Fix build bustage from bug 479109.
authorBlake Kaplan <mrbkap@gmail.com>
Mon, 23 Feb 2009 12:11:44 -0800
changeset 25483 d34121c4769ab75775c351f27daf8376e587b385
parent 25482 efc15d672f0941185c2b98ac35a4114d5f83a780
child 25484 4d2d2fca8c0da6c8e14026fddba692e4bc9ddeb3
push id5575
push userrsayre@mozilla.com
push dateWed, 25 Feb 2009 09:05:38 +0000
treeherdermozilla-central@8eba35e62d92 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs479109
milestone1.9.2a1pre
Fix build bustage from bug 479109.
js/src/jstracer.cpp
--- a/js/src/jstracer.cpp
+++ b/js/src/jstracer.cpp
@@ -3421,17 +3421,17 @@ js_AttemptToExtendTree(JSContext* cx, VM
         c->spawnedFrom = anchor;
         c->parent = f;
         anchor->target = c;
         c->root = f;
     }
 
     debug_only_v(printf("trying to attach another branch to the tree (hits = %d)\n", c->hits());)
 
-    int32& hits = c->hits();
+    int32_t& hits = c->hits();
     if (hits++ >= HOTEXIT && hits <= HOTEXIT+MAXEXIT) {
         /* start tracing secondary trace from this point */
         c->lirbuf = f->lirbuf;
         unsigned stackSlots;
         unsigned ngslots;
         uint8* typeMap;
         TypeMap fullMap;
         if (exitedFrom == NULL) {
@@ -4188,17 +4188,17 @@ js_MonitorLoopEdge(JSContext* cx, uintN&
     record:
         /* We can give RecordTree the root peer. If that peer is already taken, it will
            walk the peer list and find us a free slot or allocate a new tree if needed. */
         return js_RecordTree(cx, tm, f->first, NULL, globalShape, globalSlots);
     }
 
     debug_only_v(printf("Looking for compat peer %d@%d, from %p (ip: %p)\n",
                         js_FramePCToLineNumber(cx, cx->fp),
-                        FramePCOffset(cx->fp), f, f->ip);)
+                        FramePCOffset(cx->fp), (void*)f, f->ip);)
 
     uintN count;
     Fragment* match = js_FindVMCompatiblePeer(cx, f, count);
     if (!match) {
         if (count < MAXPEERS)
             goto record;
         /* If we hit the max peers ceiling, don't try to lookup fragments all the time. Thats
            expensive. This must be a rather type-unstable loop. */