No bug. Fix --disable-methodjit build breakage from 23936f566781 (bug 710032). r=woof!

This commit is contained in:
Steve Fink 2011-12-29 15:19:26 -08:00
Родитель 7455dd5ff7
Коммит 859fe9155c
2 изменённых файлов: 5 добавлений и 7 удалений

Просмотреть файл

@ -55,9 +55,7 @@
#include "jsscript.h"
#include "jsstr.h"
#ifdef JS_METHODJIT
# include "methodjit/Compiler.h"
#endif
#include "methodjit/Compiler.h"
#include "jsobjinlines.h"
@ -118,6 +116,7 @@ Probes::JITGranularityRequested()
return want;
}
#ifdef JS_METHODJIT
/*
* Flatten the tree of inlined frames into a series of native code regions, one
* for each contiguous section of native code that belongs to a single
@ -217,7 +216,6 @@ Probes::JITWatcher::CollectNativeRegions(RegionVector &regions,
return true;
}
#ifdef JS_METHODJIT
void
Probes::registerMJITCode(JSContext *cx, js::mjit::JITScript *jscr,
js::mjit::JSActiveFrame *outerFrame,

Просмотреть файл

@ -243,15 +243,15 @@ public:
typedef Vector<NativeRegion, 0, RuntimeAllocPolicy> RegionVector;
virtual JITReportGranularity granularityRequested() = 0;
#ifdef JS_METHODJIT
static bool CollectNativeRegions(RegionVector &regions,
JSRuntime *rt,
mjit::JITScript *jit,
mjit::JSActiveFrame *outerFrame,
mjit::JSActiveFrame **inlineFrames);
virtual JITReportGranularity granularityRequested() = 0;
#ifdef JS_METHODJIT
virtual void registerMJITCode(JSContext *cx, js::mjit::JITScript *jscr,
mjit::JSActiveFrame *outerFrame,
mjit::JSActiveFrame **inlineFrames,