Bug 1100129 - Add a missing prebarrier. r=terrence
authorJan de Mooij <jdemooij@mozilla.com>
Mon, 17 Nov 2014 21:17:32 +0100
changeset 240464 67886da0a1d8ba83340dfd18c8996b12b7b5d3e2
parent 240463 cda8cad77b9ff8d4d08b1e88f02f2b30bf9b1e07
child 240465 6fcbd0ed5a280581817b9fee696c7bffdefd956f
push id4311
push userraliiev@mozilla.com
push dateMon, 12 Jan 2015 19:37:41 +0000
treeherdermozilla-beta@150c9fed433b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersterrence
bugs1100129
milestone36.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 1100129 - Add a missing prebarrier. r=terrence
js/src/jit/BaselineCompiler.cpp
--- a/js/src/jit/BaselineCompiler.cpp
+++ b/js/src/jit/BaselineCompiler.cpp
@@ -3575,16 +3575,17 @@ BaselineCompiler::emit_JSOP_RESUME()
         {
             masm.pushValue(Address(scratch2, 0));
             masm.addPtr(Imm32(sizeof(Value)), scratch2);
             masm.sub32(Imm32(1), initLength);
             masm.jump(&loop);
         }
         masm.bind(&loopDone);
 
+        masm.patchableCallPreBarrier(exprStackSlot, MIRType_Value);
         masm.storeValue(NullValue(), exprStackSlot);
         regs.add(initLength);
     }
 
     masm.bind(&noExprStack);
     masm.pushValue(retVal);
 
     if (resumeKind == GeneratorObject::NEXT) {