bug 879647: Don't throw process fatal assortions when we're about to abort the compilation. (r=jbramley)

This commit is contained in:
Marty Rosenberg 2013-10-23 08:29:45 -04:00
parent 111f7ebdfa
commit b5b8a340f5
2 changed files with 5 additions and 1 deletions

View File

@ -1821,7 +1821,9 @@ class Assembler
static void updateBoundsCheck(uint32_t logHeapSize, Instruction *inst);
void processCodeLabels(uint8_t *rawCode);
bool bailed() {
return m_buffer.bail();
}
}; // Assembler
// An Instruction is a structure for both encoding and decoding any and all ARM instructions.

View File

@ -212,6 +212,8 @@ CodeGeneratorARM::bailoutIf(Assembler::Condition condition, LSnapshot *snapshot)
bool
CodeGeneratorARM::bailoutFrom(Label *label, LSnapshot *snapshot)
{
if (masm.bailed())
return false;
JS_ASSERT(label->used());
JS_ASSERT(!label->bound());