Bug 1296087: Improve getter cache r=nbp
authorMichael Smith <michael@spinda.net>
Wed, 17 Aug 2016 13:53:08 -0700
changeset 311291 abe23b9940e2ef286940318311f3ed69194262a1
parent 311290 9a7524861d8b5b255529a8e78da741ec6d896f7f
child 311292 12d8a0ac1520b68af430616938def5b3ddaf53cb
push id20395
push userryanvm@gmail.com
push dateFri, 26 Aug 2016 13:37:30 +0000
treeherderfx-team@a65b35c8e5b1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnbp
bugs1296087
milestone51.0a1
Bug 1296087: Improve getter cache r=nbp
js/src/jit/IonCaches.cpp
--- a/js/src/jit/IonCaches.cpp
+++ b/js/src/jit/IonCaches.cpp
@@ -1108,17 +1108,17 @@ GenerateCallGetter(JSContext* cx, IonScr
     // Save off the object register if it aliases the scratchReg
     if (spillObjReg) {
         masm.push(object);
         maybePopAndFail = &pop1AndFail;
     }
 
     // Note: this may clobber the object register if it's used as scratch.
     if (obj != holder)
-        GeneratePrototypeGuards(cx, ion, masm, obj, holder, object, scratchReg, failures);
+        GeneratePrototypeGuards(cx, ion, masm, obj, holder, object, scratchReg, maybePopAndFail);
 
     // Guard on the holder's shape.
     Register holderReg = scratchReg;
     masm.movePtr(ImmGCPtr(holder), holderReg);
     masm.branchPtr(Assembler::NotEqual,
                    Address(holderReg, ShapedObject::offsetOfShape()),
                    ImmGCPtr(holder->as<NativeObject>().lastProperty()),
                    maybePopAndFail);