[pypy-svn] r63132 - pypy/branch/virtualizable-specnodes-2/pypy/jit/backend/llgraph

[fijal at codespeak.net]

Author: fijal
Date: Fri Mar 20 13:32:50 2009
New Revision: 63132

Modified:
   pypy/branch/virtualizable-specnodes-2/pypy/jit/backend/llgraph/runner.py
Log:
store catches in jump2target as well


Modified: pypy/branch/virtualizable-specnodes-2/pypy/jit/backend/llgraph/runner.py
==============================================================================
--- pypy/branch/virtualizable-specnodes-2/pypy/jit/backend/llgraph/runner.py	(original)
+++ pypy/branch/virtualizable-specnodes-2/pypy/jit/backend/llgraph/runner.py	Fri Mar 20 13:32:50 2009
@@ -135,7 +135,7 @@
                                                                x))
             if op.jump_target is not None:
                 loop_target, loop_target_index = \
-                                           self.jumptarget2loop[op.jump_target]
+                         self.jumptarget2loop[op.jump_target.operations[0]]
                 llimpl.compile_add_jump_target(c, loop_target,
                                                   loop_target_index)
             if op.is_guard():
@@ -144,7 +144,7 @@
                 for box in op.liveboxes:
                     assert isinstance(box, history.Box)
                     llimpl.compile_add_livebox(c, var2index[box])
-            if op.opnum == rop.MERGE_POINT:
+            if op.opnum == rop.MERGE_POINT or op.opnum == rop.CATCH:
                 self.jumptarget2loop[op] = c, i
         if from_guard is not None:
             llimpl.compile_from_guard(c, from_guard._compiled,