[pypy-svn] r62218 - pypy/branch/pyjitpl5/pypy/jit/metainterp

[arigo at codespeak.net]

Author: arigo
Date: Fri Feb 27 12:19:18 2009
New Revision: 62218

Modified:
   pypy/branch/pyjitpl5/pypy/jit/metainterp/optimize.py
Log:
Fix test_can_enter_jit_outside_main_loop
when run via test_loop_spec.


Modified: pypy/branch/pyjitpl5/pypy/jit/metainterp/optimize.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/metainterp/optimize.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/metainterp/optimize.py	Fri Feb 27 12:19:18 2009
@@ -471,12 +471,15 @@
         end_args = self.loop.operations[-1].args
         memo = {}
         for i in range(len(end_args)):
-            self.nodes[end_args[i]].escape_if_startbox(memo)
+            end_box = end_args[i]
+            if isinstance(end_box, Box):
+                self.nodes[end_box].escape_if_startbox(memo)
         for i in range(len(end_args)):
             box = self.loop.operations[0].args[i]
             other_box = end_args[i]
-            self.nodes[box].add_to_dependency_graph(self.nodes[other_box],
-                                                    self.dependency_graph)
+            if isinstance(other_box, Box):
+                self.nodes[box].add_to_dependency_graph(self.nodes[other_box],
+                                                        self.dependency_graph)
         # XXX find efficient algorithm, we're too fried for that by now
         done = False
         while not done: