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

Bug 708156: Ensure that JM compilation doesn't used out-of-date ScriptAnalysis structures. r=bhackett

Browse Source
This commit is contained in:
Jim Blandy 2011-12-15 18:08:00 -08:00
parent 93b50a846c
commit fc9d22a5e5
4 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/src/jsanalyze.cpp
View File

@ -1894,6 +1894,12 @@ SSAValue::print() const
}
}
void
ScriptAnalysis::assertMatchingDebugMode()
{
JS_ASSERT(!!script->compartment()->debugMode() == !!originalDebugMode_);
}
#endif /* DEBUG */
} /* namespace analyze */

20
js/src/jsanalyze.h
View File

@ -822,6 +822,11 @@ class ScriptAnalysis
bool ranLifetimes_;
bool ranInference_;
#ifdef DEBUG
/* Whether the compartment was in debug mode when we performed the analysis. */
bool originalDebugMode_: 1;
#endif
/* --------- Bytecode analysis --------- */
bool usesReturnValue_:1;
@ -843,7 +848,13 @@ class ScriptAnalysis
public:
ScriptAnalysis(JSScript *script) { PodZero(this); this->script = script; }
ScriptAnalysis(JSScript *script) {
PodZero(this);
this->script = script;
#ifdef DEBUG
this->originalDebugMode_ = script->compartment()->debugMode();
#endif
}
bool ranBytecode() { return ranBytecode_; }
bool ranSSA() { return ranSSA_; }
@ -1164,6 +1175,13 @@ class ScriptAnalysis
bool analyzeTypesBytecode(JSContext *cx, unsigned offset, TypeInferenceState &state);
bool followEscapingArguments(JSContext *cx, const SSAValue &v, Vector<SSAValue> *seen);
bool followEscapingArguments(JSContext *cx, SSAUseChain *use, Vector<SSAValue> *seen);
public:
#ifdef DEBUG
void assertMatchingDebugMode();
#else
void assertMatchingDebugMode() { }
#endif
};
/* Protect analysis structures from GC while they are being used. */

5
js/src/jscompartment.cpp
View File

@ -639,13 +639,14 @@ JSCompartment::updateForDebugMode(JSContext *cx)
}
/*
* Discard JIT code for any scripts that change debugMode. This assumes
* that 'comp' is in the same thread as 'cx'.
* Discard JIT code and bytecode analyses for any scripts that change
* debugMode. This assumes that 'comp' is in the same thread as 'cx'.
*/
for (gc::CellIter i(cx, this, gc::FINALIZE_SCRIPT); !i.done(); i.next()) {
JSScript *script = i.get<JSScript>();
if (script->debugMode != enabled) {
mjit::ReleaseScriptCode(cx, script);
script->clearAnalysis();
script->debugMode = enabled;
}
}

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

@ -189,6 +189,7 @@ mjit::Compiler::checkAnalysis(JSScript *script)
return Compile_Error;
ScriptAnalysis *analysis = script->analysis();
analysis->assertMatchingDebugMode();
if (analysis->failed()) {
JaegerSpew(JSpew_Abort, "couldn't analyze bytecode; probably switchX or OOM\n");
return Compile_Abort;