Bug 1269729 - Handle another OOM case on ARM. (r=jolesen) a=ritu
authorEric Faust <efaustbmo@gmail.com>
Wed, 04 May 2016 15:54:43 -0700
changeset 326320 4f79d42e0293372bd2a5dc4b28a62d5c9a66ce6d
parent 326319 336ed068cb68150195e0459eeb69d33026e76e1e
child 326321 d0f4ff4d5b5b9c92d6ade729f56b7bc0642e665a
push id1128
push userjlund@mozilla.com
push dateWed, 01 Jun 2016 01:31:59 +0000
treeherdermozilla-release@fe0d30de989d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjolesen, ritu
bugs1269729
milestone47.0
Bug 1269729 - Handle another OOM case on ARM. (r=jolesen) a=ritu
js/src/jit/arm/CodeGenerator-arm.cpp
--- a/js/src/jit/arm/CodeGenerator-arm.cpp
+++ b/js/src/jit/arm/CodeGenerator-arm.cpp
@@ -1118,17 +1118,17 @@ CodeGeneratorARM::emitTableSwitchDispatc
 
     // To fill in the CodeLabels for the case entries, we need to first generate
     // the case entries (we don't yet know their offsets in the instruction
     // stream).
     OutOfLineTableSwitch* ool = new(alloc()) OutOfLineTableSwitch(alloc(), mir);
     for (int32_t i = 0; i < cases; i++) {
         CodeLabel cl;
         masm.writeCodePointer(cl.patchAt());
-        ool->addCodeLabel(cl);
+        masm.propagateOOM(ool->addCodeLabel(cl));
     }
     addOutOfLineCode(ool, mir);
 }
 
 void
 CodeGeneratorARM::visitMathD(LMathD* math)
 {
     const LAllocation* src1 = math->getOperand(0);