Blacklisting a trace could spent too much time in the interpreter (bug 595032, r=dvander).
authorBill McCloskey <wmccloskey@mozilla.com>
Thu, 09 Sep 2010 18:06:02 -0700
changeset 53634 c70c6d647f239b316d938995add5bc820cfa099b
parent 53633 fbaed38f2fb5ace823eb48b33b55730d699d2246
child 53635 a1f43f4ef565ecf8a01037f8db6de1284ebd66ad
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdvander
bugs595032
milestone2.0b6pre
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
Blacklisting a trace could spent too much time in the interpreter (bug 595032, r=dvander).
js/src/jsinterp.cpp
--- a/js/src/jsinterp.cpp
+++ b/js/src/jsinterp.cpp
@@ -2230,18 +2230,16 @@ Interpret(JSContext *cx, JSStackFrame *e
         regs.pc += (n);                                                       \
         op = (JSOp) *regs.pc;                                                 \
         if ((n) <= 0) {                                                       \
             CHECK_BRANCH();                                                   \
             if (op == JSOP_NOP) {                                             \
                 if (TRACE_RECORDER(cx)) {                                     \
                     MONITOR_BRANCH();                                         \
                     op = (JSOp) *regs.pc;                                     \
-                } else {                                                      \
-                    op = (JSOp) *++regs.pc;                                   \
                 }                                                             \
             } else if (op == JSOP_TRACE) {                                    \
                 MONITOR_BRANCH();                                             \
                 op = (JSOp) *regs.pc;                                         \
             }                                                                 \
         }                                                                     \
         LEAVE_ON_SAFE_POINT();                                                \
         DO_OP();                                                              \