Bug 1177922 - Fix a bogus assert on OOM in markSafepointAt. r=nbp

This commit is contained in:
Jan de Mooij 2015-07-14 11:12:09 +02:00
parent 92399d87fd
commit 0e02ac6ab3

View File

@ -1002,7 +1002,7 @@ CodeGeneratorShared::markSafepoint(LInstruction* ins)
void void
CodeGeneratorShared::markSafepointAt(uint32_t offset, LInstruction* ins) CodeGeneratorShared::markSafepointAt(uint32_t offset, LInstruction* ins)
{ {
MOZ_ASSERT_IF(!safepointIndices_.empty(), MOZ_ASSERT_IF(!safepointIndices_.empty() && !masm.oom(),
offset - safepointIndices_.back().displacement() >= sizeof(uint32_t)); offset - safepointIndices_.back().displacement() >= sizeof(uint32_t));
masm.propagateOOM(safepointIndices_.append(SafepointIndex(offset, ins->safepoint()))); masm.propagateOOM(safepointIndices_.append(SafepointIndex(offset, ins->safepoint())));
} }