[pypy-commit] pypy jit-short_from_state: Only the first discovered producer of each box is accepted into the short preamble and the state after reconstruction must reflect this. Fixes test_virtual_attribute_pure_function.

[hakanardo]

Author: Hakan Ardo <hakan at debian.org>
Branch: jit-short_from_state
Changeset: r45181:d32f7ca89e5d
Date: 2011-06-29 15:28 +0200
http://bitbucket.org/pypy/pypy/changeset/d32f7ca89e5d/

Log:	Only the first discovered producer of each box is accepted into the
	short preamble and the state after reconstruction must reflect this.
	Fixes test_virtual_attribute_pure_function.

diff --git a/pypy/jit/metainterp/optimizeopt/optimizer.py b/pypy/jit/metainterp/optimizeopt/optimizer.py
--- a/pypy/jit/metainterp/optimizeopt/optimizer.py
+++ b/pypy/jit/metainterp/optimizeopt/optimizer.py
@@ -392,7 +392,7 @@
             
         new.pure_operations = args_dict()
         for key, op in self.pure_operations.items():
-            if op.result in short_boxes:
+            if op.result in short_boxes and short_boxes[op.result] is op:
                 new.pure_operations[key] = op
         new.producer = self.producer
         assert self.posponedop is None