--- 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. */