Bug 1269729 - Handle another OOM case on ARM. (r=jolesen)
authorEric Faust <efaustbmo@gmail.com>
Wed, 04 May 2016 15:54:43 -0700
changeset 296146 374889c1ff7dde28ec8700652563bdfafbb70354
parent 296145 40745bcb866ff190c40d9a58cb3006a1c58031ba
child 296147 a923340a036f267c8f46d341764bfba3d86933bc
push id76221
push userefaustbmo@gmail.com
push dateWed, 04 May 2016 22:54:58 +0000
treeherdermozilla-inbound@374889c1ff7d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjolesen
bugs1269729
milestone49.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1269729 - Handle another OOM case on ARM. (r=jolesen)
js/src/jit/arm/CodeGenerator-arm.cpp
--- a/js/src/jit/arm/CodeGenerator-arm.cpp
+++ b/js/src/jit/arm/CodeGenerator-arm.cpp
@@ -1128,17 +1128,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)
 {
     FloatRegister src1 = ToFloatRegister(math->getOperand(0));