wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Don't allocate JIT code across compartments (bug 612717, r=dmandelin).

Browse Source
This commit is contained in:
David Anderson 2010-11-22 16:49:22 -08:00
parent d55d108bd4
commit db9179ba67
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/src/methodjit/BaseCompiler.h
View File

@ -90,14 +90,15 @@ class BaseCompiler : public MacroAssemblerTypedefs
protected:
JSC::ExecutablePool *
getExecPool(size_t size) {
return BaseCompiler::GetExecPool(cx, size);
getExecPool(JSScript *script, size_t size) {
return BaseCompiler::GetExecPool(cx, script, size);
}
public:
static JSC::ExecutablePool *
GetExecPool(JSContext *cx, size_t size) {
JSC::ExecutablePool *pool = cx->jaegerCompartment()->poolForSize(size);
GetExecPool(JSContext *cx, JSScript *script, size_t size) {
JaegerCompartment *jc = script->compartment->jaegerCompartment;
JSC::ExecutablePool *pool = jc->poolForSize(size);
if (!pool)
js_ReportOutOfMemory(cx);
return pool;
@ -150,7 +151,8 @@ class LinkerHelper : public JSC::LinkBuffer
JSC::ExecutablePool *init(JSContext *cx) {
// The pool is incref'd after this call, so it's necessary to release()
// on any failure.
JSC::ExecutablePool *ep = BaseCompiler::GetExecPool(cx, masm.size());
JSScript *script = cx->fp()->script();
JSC::ExecutablePool *ep = BaseCompiler::GetExecPool(cx, script, masm.size());
if (!ep)
return ep;

2
js/src/methodjit/Compiler.cpp
View File

@ -395,7 +395,7 @@ mjit::Compiler::finishThisUp(JITScript **jitp)
stubcc.size() +
doubleList.length() * sizeof(double);
JSC::ExecutablePool *execPool = getExecPool(totalSize);
JSC::ExecutablePool *execPool = getExecPool(script, totalSize);
if (!execPool)
return Compile_Abort;