[pypy-svn] r32680 - pypy/dist/pypy/translator

[arigo at codespeak.net]

Author: arigo
Date: Wed Sep 27 21:00:15 2006
New Revision: 32680

Modified:
   pypy/dist/pypy/translator/simplify.py
Log:
Fixes to avoid relying on having-a-single-exit as meaning that there is
no exitswitch (see r32679).


Modified: pypy/dist/pypy/translator/simplify.py
==============================================================================
--- pypy/dist/pypy/translator/simplify.py	(original)
+++ pypy/dist/pypy/translator/simplify.py	Wed Sep 27 21:00:15 2006
@@ -60,10 +60,11 @@
     def visit(link):
         if isinstance(link, Link):
             while not link.target.operations:
-                if (len(link.target.exits) != 1 and
-                    link.target.exitswitch != c_last_exception):
-                    break
                 block1 = link.target
+                if block1.exitswitch is not None:
+                    break
+                if not block1.exits:
+                    break
                 exit = block1.exits[0]
                 assert block1 is not exit.target, (
                     "the graph contains an empty infinite loop")
@@ -321,9 +322,10 @@
     stack = list(block.exits)
     while stack:
         link = stack.pop()
-        if (len(link.prevblock.exits) == 1 and
+        if (link.prevblock.exitswitch is None and
             len(entrymap[link.target]) == 1 and
             link.target.exits):  # stop at the returnblock
+            assert len(link.prevblock.exits) == 1
             renaming = {}
             for vprev, vtarg in zip(link.args, link.target.inputargs):
                 renaming[vtarg] = vprev