[pypy-commit] pypy guard-compatible: (remi, arigo)

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: guard-compatible
Changeset: r94038:ec6d67e6b1cb
Date: 2018-03-20 18:45 +0100
http://bitbucket.org/pypy/pypy/changeset/ec6d67e6b1cb/

Log:	(remi, arigo)

	Fix what looks like a bug by staring at the diff with default

diff --git a/rpython/jit/metainterp/optimizeopt/optimizer.py b/rpython/jit/metainterp/optimizeopt/optimizer.py
--- a/rpython/jit/metainterp/optimizeopt/optimizer.py
+++ b/rpython/jit/metainterp/optimizeopt/optimizer.py
@@ -665,8 +665,9 @@
                                              self._last_guard_op)
         else:
             op = self.store_final_boxes_in_guard(guard_op, pendingfields)
+            self._last_guard_op = op
             if opnum == rop.GUARD_COMPATIBLE:
-                self._last_guard_op = op # XXX don't share the next one either
+                self._last_guard_op = None # XXX don't share the next one either
             # for unrolling
             for farg in op.getfailargs():
                 if farg: