Author: Remi Meier <[email protected]>
Branch: stmgc-c4
Changeset: r66791:7162dd07c7a1
Date: 2013-09-05 13:15 +0200
http://bitbucket.org/pypy/pypy/changeset/7162dd07c7a1/
Log: fix some merge leftovers
diff --git a/pypy/interpreter/pyopcode.py b/pypy/interpreter/pyopcode.py
--- a/pypy/interpreter/pyopcode.py
+++ b/pypy/interpreter/pyopcode.py
@@ -199,7 +199,7 @@
else:
next_instr = block.handle(self, unroller)
elif opcode == opcodedesc.JUMP_ABSOLUTE.index:
- next_instr = self.jump_absolute(oparg, ec)
+ return self.jump_absolute(oparg, ec)
elif opcode == opcodedesc.BREAK_LOOP.index:
next_instr = self.BREAK_LOOP(oparg, next_instr)
elif opcode == opcodedesc.CONTINUE_LOOP.index:
@@ -455,10 +455,10 @@
from rpython.rlib import rstm
if rstm.should_break_transaction():
opcode = ord(co_code[next_instr])
- if opcode not in (self.opcodedesc.RETURN_VALUE.index,
- self.opcodedesc.POP_TOP.index,
- self.opcodedesc.LOAD_CONST.index,
- self.opcodedesc.LOAD_FAST.index):
+ if opcode not in (opcodedesc.RETURN_VALUE.index,
+ opcodedesc.POP_TOP.index,
+ opcodedesc.LOAD_CONST.index,
+ opcodedesc.LOAD_FAST.index):
return next_instr
@jit.unroll_safe
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
