Bug 1255956: Check for OOM after flushing constant pools; r?luke draft
authorBenjamin Bouvier <benj@benj.me>
Mon, 14 Mar 2016 16:43:24 +0100
changeset 339970 39989ddca7b9605b82ef6002cd9e66baa8ad6008
parent 339969 2b83147ead2695427cd346eb80cf8c33a2210ba7
child 516097 cde2ecbe2b670af6722fb5d90b739dc0d9ed0c24
push id12852
push userbenj@benj.me
push dateMon, 14 Mar 2016 15:43:38 +0000
reviewersluke
bugs1255956
milestone48.0a1
Bug 1255956: Check for OOM after flushing constant pools; r?luke MozReview-Commit-ID: KPOxVZ2D4vi
js/src/jit/CodeGenerator.cpp
--- a/js/src/jit/CodeGenerator.cpp
+++ b/js/src/jit/CodeGenerator.cpp
@@ -8327,16 +8327,18 @@ CodeGenerator::generateAsmJS(wasm::FuncO
     // Note the end of the inline code and start of the OOL code.
     gen->perfSpewer().noteEndInlineCode(masm);
 #endif
 
     if (!generateOutOfLineCode())
         return false;
 
     masm.flush();
+    if (masm.oom())
+        return false;
 
     offsets->end = masm.currentOffset();
 
     MOZ_ASSERT(!masm.failureLabel()->used());
     MOZ_ASSERT(snapshots_.listSize() == 0);
     MOZ_ASSERT(snapshots_.RVATableSize() == 0);
     MOZ_ASSERT(recovers_.size() == 0);
     MOZ_ASSERT(bailouts_.empty());