[pypy-commit] pypy py3.3: merge heads

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: py3.3
Changeset: r72502:2ff4e3b542b6
Date: 2014-07-26 13:59 +0200
http://bitbucket.org/pypy/pypy/changeset/2ff4e3b542b6/

Log:	merge heads

diff --git a/pypy/interpreter/pyopcode.py b/pypy/interpreter/pyopcode.py
--- a/pypy/interpreter/pyopcode.py
+++ b/pypy/interpreter/pyopcode.py
@@ -204,7 +204,7 @@
             elif opcode == opcodedesc.BREAK_LOOP.index:
                 next_instr = self.BREAK_LOOP(oparg, next_instr)
             elif opcode == opcodedesc.CONTINUE_LOOP.index:
-                next_instr = self.CONTINUE_LOOP(oparg, next_instr)
+                return self.CONTINUE_LOOP(oparg, next_instr)
             elif opcode == opcodedesc.FOR_ITER.index:
                 next_instr = self.FOR_ITER(oparg, next_instr)
             elif opcode == opcodedesc.JUMP_FORWARD.index:
@@ -1022,7 +1022,6 @@
                     raise
                 w_value = space.w_None
             self.pushvalue(w_value)
-            return next_instr
         else:
             # iter remains on stack, w_retval is value to be yielded.
             self.pushvalue(w_retval)