[pypy-commit] pypy jit-duplicated_short_boxes: no point in importing extra info from preamble about values at these points

[hakanardo]

Author: Hakan Ardo <hakan at debian.org>
Branch: jit-duplicated_short_boxes
Changeset: r47127:88fb2b9f8a28
Date: 2011-09-07 09:57 +0200
http://bitbucket.org/pypy/pypy/changeset/88fb2b9f8a28/

Log:	no point in importing extra info from preamble about values at these
	points

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
@@ -561,7 +561,7 @@
         for i in range(n):
             arg = op.getarg(i)
             try:
-                value = self.getvalue(arg)
+                value = self.values[arg]
             except KeyError:
                 pass
             else:
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
@@ -467,7 +467,7 @@
         inputargs.append(box)
         box = newresult
         if box in self.optimizer.values:
-            box = self.optimizer.getvalue(box).force_box()
+            box = self.optimizer.values[box].force_box()
         jumpargs.append(box)