зеркало из https://github.com/mozilla/pjs.git
No bug. Fix --disable-methodjit build breakage from 23936f566781 (bug 710032). r=woof!
This commit is contained in:
Родитель
7455dd5ff7
Коммит
859fe9155c
|
@ -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 ®ions,
|
|||
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 ®ions,
|
||||
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,
|
||||
|
|
Загрузка…
Ссылка в новой задаче