From 127b47d5cfa258a6e590f975323f485b46eb81ff Mon Sep 17 00:00:00 2001
From: David Anderson <danderson@mozilla.com>
Date: Tue, 8 Jun 2010 22:27:28 -0700
Subject: [PATCH] [JAEGER] Fixed bug when RHS of shift was 0.

---
 js/src/methodjit/nunbox/FastOps.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/src/methodjit/nunbox/FastOps.cpp b/js/src/methodjit/nunbox/FastOps.cpp
index 8a21c12b00..538ac61ff0 100644
--- a/js/src/methodjit/nunbox/FastOps.cpp
+++ b/js/src/methodjit/nunbox/FastOps.cpp
@@ -245,9 +245,9 @@ mjit::Compiler::jsop_bitop(JSOp op)
                  * Just pop RHS - leave LHS. ARM can't shift by 0.
                  * Type of LHS should be learned already.
                  */
-                masm.pop();
+                frame.pop();
                 if (stubNeeded)
-                    stubcc.rejoin(2);
+                    stubcc.rejoin(1);
                 return;
             }
 
-- 
2.11.4.GIT