Bug 798589 - Change GetProp IC attachCallGetter to use script being jitted to get ion framesize instaed of script the getprop belongs to. (r=jandem)
authorKannan Vijayan <kvijayan@mozilla.com>
Sat, 06 Oct 2012 09:58:06 -0400
changeset 109361 b47091bd31446103a4a66e47da3759e9bdb025d2
parent 109360 6d185126ad5e780a766396330c22c6db18326f61
child 109528 9f677c2bb33ded3d9d2a4058c00a388b267dc8ec
push id23629
push userkvijayan@mozilla.com
push dateSat, 06 Oct 2012 13:58:35 +0000
treeherdermozilla-central@b47091bd3144 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjandem
bugs798589
milestone18.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 798589 - Change GetProp IC attachCallGetter to use script being jitted to get ion framesize instaed of script the getprop belongs to. (r=jandem)
js/src/ion/IonCaches.cpp
--- a/js/src/ion/IonCaches.cpp
+++ b/js/src/ion/IonCaches.cpp
@@ -587,17 +587,17 @@ IonCacheGetProperty::attachCallGetter(JS
     MacroAssembler masm;
     RepatchLabel failures;
 
     JS_ASSERT(!idempotent());
     JS_ASSERT(allowGetters());
 
     // Need to set correct framePushed on the masm so that exit frame descriptors are
     // properly constructed.
-    masm.setFramePushed(script->ionScript()->frameSize());
+    masm.setFramePushed(ion->frameSize());
 
     // Generating a call getter may need the pushed typeset.
     types::StackTypeSet *outputTypes = script->analysis()->pushedTypes(pc, 0);
 
     GetNativePropertyStub getprop;
     if (!getprop.generateCallGetter(cx, masm, obj, name(), holder, shape, liveRegs,
                                     object(), output(), outputTypes, returnAddr, pc,
                                     &failures))