Bug 1242462 - Allow IonMonkey re-enter until we reached the frequent bailout threshold. r=jandem

This commit is contained in:
Nicolas B. Pierron 2016-02-29 13:20:37 +00:00
parent 56d3c8e8f0
commit 5010bc6f5f
2 changed files with 2 additions and 5 deletions

View File

@ -278,7 +278,7 @@ jit::CheckFrequentBailouts(JSContext* cx, JSScript* script, BailoutKind bailoutK
// we compile this script LICM will be disabled.
IonScript* ionScript = script->ionScript();
if (ionScript->numBailouts() >= JitOptions.frequentBailoutThreshold) {
if (ionScript->bailoutExpected()) {
// If we bailout because of the first execution of a basic block,
// then we should record which basic block we are returning in,
// which should prevent this from happening again. Also note that

View File

@ -418,11 +418,8 @@ struct IonScript
void incNumBailouts() {
numBailouts_++;
}
uint32_t numBailouts() const {
return numBailouts_;
}
bool bailoutExpected() const {
return numBailouts_ > 0;
return numBailouts_ >= JitOptions.frequentBailoutThreshold;
}
void setHasProfilingInstrumentation() {
hasProfilingInstrumentation_ = true;