[tor-commits] [tor-browser/esr24] Bug 978811 - Fix isFakeExitFrame to return true for entry frames. r=nbp, a=lmandel

[mikeperry at torproject.org]

commit e1710d77a0d80c5f2bd2e3bf3b09dad4a20478e8
Author: Jan de Mooij <jdemooij at mozilla.com>
Date:   Tue May 20 08:34:25 2014 -0400

    Bug 978811 - Fix isFakeExitFrame to return true for entry frames. r=nbp, a=lmandel
---
 js/src/jit/IonFrames-inl.h |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/js/src/jit/IonFrames-inl.h b/js/src/jit/IonFrames-inl.h
index c3893469..cd0c716 100644
--- a/js/src/jit/IonFrames-inl.h
+++ b/js/src/jit/IonFrames-inl.h
@@ -82,7 +82,8 @@ IonFrameIterator::isFakeExitFrame() const
 {
     bool res = (prevType() == IonFrame_Unwound_Rectifier ||
                 prevType() == IonFrame_Unwound_OptimizedJS ||
-                prevType() == IonFrame_Unwound_BaselineStub);
+                prevType() == IonFrame_Unwound_BaselineStub ||
+                (prevType() == IonFrame_Entry && type() == IonFrame_Exit));
     JS_ASSERT_IF(res, type() == IonFrame_Exit || type() == IonFrame_BaselineJS);
     return res;
 }