[pypy-svn] rev 1514 - in pypy/trunk/src/pypy/translator: . test

[hpk at codespeak.net]

Author: hpk
Date: Wed Oct  1 21:26:18 2003
New Revision: 1514

Modified:
   pypy/trunk/src/pypy/translator/simplify.py
   pypy/trunk/src/pypy/translator/test/test_pyrextrans.py
Log:
removed (pre?!) mature optimization



Modified: pypy/trunk/src/pypy/translator/simplify.py
==============================================================================
--- pypy/trunk/src/pypy/translator/simplify.py	(original)
+++ pypy/trunk/src/pypy/translator/simplify.py	Wed Oct  1 21:26:18 2003
@@ -26,11 +26,8 @@
     victims = True
     while victims:
         victims = False
-        victimlist = []
         entrymap = graph.mkentrymap()
         for node in graph.flatten():
-            if node in victimlist:
-                continue
             if isinstance(node, BasicBlock) and len(node.operations) == 0:
                 prevnodes = entrymap[node]
                 if len(prevnodes) != 1:
@@ -39,17 +36,14 @@
                 nextbranch = node.branch
                 if not isinstance(prevbranch, Branch) or isinstance(nextbranch, EndBranch):
                    continue 
-                # 
+                # renaming ... (figure it out yourself :-)
                 if len(prevbranch.args) > len(nextbranch.args):
                     prevbranch.args = prevbranch.args[:len(nextbranch.args)]
                 else:
                     prevbranch.args.extend(nextbranch.args[len(prevbranch.args):])
                 prevbranch.target = nextbranch.target
-                targetentrylist = entrymap[nextbranch.target]
-                targetentrylist.remove(nextbranch)
-                targetentrylist.append(prevbranch)
-                victimlist.append(node)
-                victimlist.append(nextbranch)
-        victims = len(victimlist) > 0
+                print "eliminated", node, nextbranch
+                victims = True
+                break
     return graph
 

Modified: pypy/trunk/src/pypy/translator/test/test_pyrextrans.py
==============================================================================
--- pypy/trunk/src/pypy/translator/test/test_pyrextrans.py	(original)
+++ pypy/trunk/src/pypy/translator/test/test_pyrextrans.py	Wed Oct  1 21:26:18 2003
@@ -26,6 +26,8 @@
             pass
         name = func.func_name
         funcgraph = self.space.build_flow(func)
+        from pypy.translator.simplify import eliminate_empty_blocks
+        #eliminate_empty_blocks(funcgraph)
         funcgraph.source = inspect.getsource(func)
         result = GenPyrex(funcgraph).emitcode()
         make_dot(funcgraph, udir, 'ps')