mozilla-beta: changeset 53634:c70c6d647f239b316d938995add5bc820cfa099b

author	Bill McCloskey <wmccloskey@mozilla.com>
	Thu, 09 Sep 2010 18:06:02 -0700
changeset 53634	c70c6d647f239b316d938995add5bc820cfa099b
parent 53633	fbaed38f2fb5ace823eb48b33b55730d699d2246
child 53635	a1f43f4ef565ecf8a01037f8db6de1284ebd66ad
push id	1
push user	root
push date	Tue, 26 Apr 2011 22:38:44 +0000
treeherder	mozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	dvander
bugs	595032
milestone	2.0b6pre
first release with	nightly linux32 cd3c926a7413 / 4.0b6pre / 20100912030102 / files nightly linux64 cd3c926a7413 / 4.0b6pre / 20100912030140 / files nightly mac cd3c926a7413 / 4.0b6pre / 20100912030939 / files nightly win32 cd3c926a7413 / 4.0b6pre / 20100912041924 / files nightly win64 6dfa6a7c94e0 / 4.0b7pre / 20100915014851 / files
last release without	nightly linux32 cf0088ff07f2 / 4.0b6pre / 20100907025936 / files nightly linux64 cf0088ff07f2 / 4.0b6pre / 20100907030647 / files nightly mac cf0088ff07f2 / 4.0b6pre / 20100907030918 / files nightly win32 cf0088ff07f2 / 4.0b6pre / 20100907041859 / files nightly win64 f47972d05473 / 4.0b6pre / 20100901011120 / files

--- 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();                                                              \