From e9caea3d48028f3720c123c3e849fb67494017aa Mon Sep 17 00:00:00 2001 From: Graydon Hoare Date: Tue, 15 Sep 2009 17:07:33 -0700 Subject: [PATCH] Bug 503424 - Additional followup to fix more profound build-breakage, r=me. --- js/src/jscntxt.h | 5 ++--- js/src/jstracer.cpp | 2 +- js/src/nanojit/Assembler.cpp | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/js/src/jscntxt.h b/js/src/jscntxt.h index d6ae2b1206dd..f7fb55a0957e 100644 --- a/js/src/jscntxt.h +++ b/js/src/jscntxt.h @@ -55,7 +55,6 @@ #include "jsprvtd.h" #include "jspubtd.h" #include "jsregexp.h" -#include "jsstdint.h" #include "jsutil.h" #include "jsarray.h" #include "jstask.h" @@ -109,7 +108,7 @@ namespace nanojit { } #if defined(JS_JIT_SPEW) || defined(DEBUG) struct FragPI; -typedef nanojit::HashMap > FragStatsMap; +typedef nanojit::HashMap > FragStatsMap; #endif class TraceRecorder; class VMAllocator; @@ -204,7 +203,7 @@ struct JSTraceMonitor { #ifdef DEBUG /* Fields needed for fragment/guard profiling. */ CLS(nanojit::Seq) branches; - uint32_t lastFragID; + uint32 lastFragID; /* * profAlloc has a lifetime which spans exactly from js_InitJIT to * js_FinishJIT. diff --git a/js/src/jstracer.cpp b/js/src/jstracer.cpp index 65541a0a5fba..721f25c7963d 100644 --- a/js/src/jstracer.cpp +++ b/js/src/jstracer.cpp @@ -457,7 +457,7 @@ struct FragPI { }; /* A mapping of Fragment.profFragID to FragPI */ -typedef HashMap FragStatsMap; +typedef HashMap FragStatsMap; void js_FragProfiling_FragFinalizer(Fragment* f, JSTraceMonitor* tm) diff --git a/js/src/nanojit/Assembler.cpp b/js/src/nanojit/Assembler.cpp index f94d9edc850b..89c492f0a25f 100644 --- a/js/src/nanojit/Assembler.cpp +++ b/js/src/nanojit/Assembler.cpp @@ -763,7 +763,7 @@ namespace nanojit _codeAlloc.addRemainder(codeList, exitStart, exitEnd, _nExitSlot, _nExitIns); _codeAlloc.addRemainder(codeList, codeStart, codeEnd, _nSlot, _nIns); verbose_only( exitBytes -= (_nExitIns - _nExitSlot) * sizeof(NIns); ) - verbose_only( codeBytes -= (_nIns - _nSlot) * sizeof(Nins); ) + verbose_only( codeBytes -= (_nIns - _nSlot) * sizeof(NIns); ) #else // [codeStart ... gap ... [_nIns, codeEnd)) _codeAlloc.addRemainder(codeList, exitStart, exitEnd, exitStart, _nExitIns);