Backed out changeset 6e1d68784ae3 (bug 1242462) for what appears to be permafail in browser_CTP_crashreporting.js CLOSED TREE

This commit is contained in:
Wes Kocher 2016-01-26 13:23:09 -08:00
parent 6c18ff59cc
commit 5fea2b71cb
2 changed files with 5 additions and 2 deletions

View File

@ -280,7 +280,7 @@ jit::CheckFrequentBailouts(JSContext* cx, JSScript* script, BailoutKind bailoutK
// we compile this script LICM will be disabled.
IonScript* ionScript = script->ionScript();
if (ionScript->bailoutExpected()) {
if (ionScript->numBailouts() >= JitOptions.frequentBailoutThreshold) {
// 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,8 +418,11 @@ struct IonScript
void incNumBailouts() {
numBailouts_++;
}
uint32_t numBailouts() const {
return numBailouts_;
}
bool bailoutExpected() const {
return numBailouts_ >= JitOptions.frequentBailoutThreshold;
return numBailouts_ > 0;
}
void setHasProfilingInstrumentation() {
hasProfilingInstrumentation_ = true;