Bug 978811 - Fix isFakeExitFrame to return true for entry frames. r=nbp, a=sledru
authorJan de Mooij <jdemooij@mozilla.com>
Tue, 20 May 2014 08:34:25 -0400
changeset 199322 d8e71359d176dec85d7fe38a047ec767f714a4cd
parent 199321 2799a3739894f7ace19c1494e7568108df295784
child 199323 70e5f9d723edcc2e192e4450d46eae08c6b76f52
push id3624
push userasasaki@mozilla.com
push dateMon, 09 Jun 2014 21:49:01 +0000
treeherdermozilla-beta@b1a5da15899a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnbp, sledru
bugs978811
milestone31.0a2
Bug 978811 - Fix isFakeExitFrame to return true for entry frames. r=nbp, a=sledru
js/src/jit/IonFrames-inl.h
--- a/js/src/jit/IonFrames-inl.h
+++ b/js/src/jit/IonFrames-inl.h
@@ -51,17 +51,18 @@ JitFrameIterator::prevType() const
     return current->prevType();
 }
 
 inline bool
 JitFrameIterator::isFakeExitFrame() const
 {
     bool res = (prevType() == JitFrame_Unwound_Rectifier ||
                 prevType() == JitFrame_Unwound_IonJS ||
-                prevType() == JitFrame_Unwound_BaselineStub);
+                prevType() == JitFrame_Unwound_BaselineStub ||
+                (prevType() == JitFrame_Entry && type() == JitFrame_Exit));
     JS_ASSERT_IF(res, type() == JitFrame_Exit || type() == JitFrame_BaselineJS);
     return res;
 }
 
 inline IonExitFrameLayout *
 JitFrameIterator::exitFrame() const
 {
     JS_ASSERT(type() == JitFrame_Exit);