[pypy-commit] pypy jit-short_from_state: translation fix

hakanardo noreply at buildbot.pypy.org
Fri Jul 15 19:39:15 CEST 2011


Author: Hakan Ardo <hakan at debian.org>
Branch: jit-short_from_state
Changeset: r45640:ddba8a22157e
Date: 2011-07-14 11:00 +0200
http://bitbucket.org/pypy/pypy/changeset/ddba8a22157e/

Log:	translation fix

diff --git a/pypy/jit/metainterp/optimizeopt/unroll.py b/pypy/jit/metainterp/optimizeopt/unroll.py
--- a/pypy/jit/metainterp/optimizeopt/unroll.py
+++ b/pypy/jit/metainterp/optimizeopt/unroll.py
@@ -382,13 +382,15 @@
         if emit:
             newop = self.short_inliner.inline_op(op)
             self.optimizer.send_extra_operation(newop)
+        else:
+            newop = None
 
         if op.is_ovf():
             # FIXME: ensure that GUARD_OVERFLOW:ed ops not end up here
             guard = ResOperation(rop.GUARD_NO_OVERFLOW, [], None)
             self.add_op_to_short(guard, short, short_seen, emit)
 
-        if emit:
+        if newop:
             return newop.result
         return None
         


More information about the pypy-commit mailing list