[pypy-commit] pypy unroll-if-alt: dont try to import more info about virtuals than what is passed as the VirtualState of the inputeargs, it wont work

[hakanardo]

Author: Hakan Ardo <hakan at debian.org>
Branch: unroll-if-alt
Changeset: r47332:06e87f8caa17
Date: 2011-09-19 08:24 +0200
http://bitbucket.org/pypy/pypy/changeset/06e87f8caa17/

Log:	dont try to import more info about virtuals than what is passed as
	the VirtualState of the inputeargs, it wont work

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
@@ -226,8 +226,9 @@
                 if op and op.result:
                     preamble_value = preamble_optimizer.getvalue(op.result)
                     value = self.optimizer.getvalue(op.result)
-                    imp = ValueImporter(self, preamble_value, op)
-                    self.optimizer.importable_values[value] = imp
+                    if not value.is_virtual():
+                        imp = ValueImporter(self, preamble_value, op)
+                        self.optimizer.importable_values[value] = imp
                     newresult = self.optimizer.getvalue(op.result).get_key_box()
                     if newresult is not op.result:
                         self.short_boxes.alias(newresult, op.result)