[pypy-svn] r74779 - in pypy/branch/blackhole-improvement/pypy/jit/codewriter: . test

[arigo at codespeak.net]

Author: arigo
Date: Wed May 26 16:35:17 2010
New Revision: 74779

Modified:
   pypy/branch/blackhole-improvement/pypy/jit/codewriter/regalloc.py
   pypy/branch/blackhole-improvement/pypy/jit/codewriter/test/test_regalloc.py
Log:
Fix the bug.


Modified: pypy/branch/blackhole-improvement/pypy/jit/codewriter/regalloc.py
==============================================================================
--- pypy/branch/blackhole-improvement/pypy/jit/codewriter/regalloc.py	(original)
+++ pypy/branch/blackhole-improvement/pypy/jit/codewriter/regalloc.py	Wed May 26 16:35:17 2010
@@ -37,7 +37,11 @@
                                 die_at[v1] = i
                 if op.result is not None:
                     die_at[op.result] = i
-            die_at.pop(block.exitswitch, None)
+            if isinstance(block.exitswitch, tuple):
+                for x in block.exitswitch:
+                    die_at.pop(x, None)
+            else:
+                die_at.pop(block.exitswitch, None)
             for link in block.exits:
                 for v in link.args:
                     die_at.pop(v, None)

Modified: pypy/branch/blackhole-improvement/pypy/jit/codewriter/test/test_regalloc.py
==============================================================================
--- pypy/branch/blackhole-improvement/pypy/jit/codewriter/test/test_regalloc.py	(original)
+++ pypy/branch/blackhole-improvement/pypy/jit/codewriter/test/test_regalloc.py	Wed May 26 16:35:17 2010
@@ -232,8 +232,8 @@
         graph = self.make_graphs(_ll_2_int_lshift_ovf, [5, 6])[0]
         self.check_assembler(graph, """
             int_lshift %i0, %i1 -> %i2
-            int_rshift %i0, %i1 -> %i1
-            goto_if_not_int_ne %i1, %i2, L1
+            int_rshift %i2, %i1 -> %i1
+            goto_if_not_int_ne %i1, %i0, L1
             -live- L1
             raise $<* struct object>
             ---