[pypy-svn] r42368 - pypy/dist/pypy/objspace/flow

[antocuni at codespeak.net]

Author: antocuni
Date: Fri Apr 27 11:41:27 2007
New Revision: 42368

Modified:
   pypy/dist/pypy/objspace/flow/model.py
Log:
(arigo, antocuni)

revert r32363 as suggested by Armin, because build_tree is not really
a transformation



Modified: pypy/dist/pypy/objspace/flow/model.py
==============================================================================
--- pypy/dist/pypy/objspace/flow/model.py	(original)
+++ pypy/dist/pypy/objspace/flow/model.py	Fri Apr 27 11:41:27 2007
@@ -573,8 +573,6 @@
 
 def checkgraph(graph):
     "Check the consistency of a flow graph."
-
-    from pypy.translator.oosupport.treebuilder import SubOperation
     if not __debug__:
         return
     try:
@@ -610,24 +608,19 @@
                 if in_link is not None:
                     assert vars[v] is None or vars[v] is in_link
 
-            def checkop(op):
+            for v in block.inputargs:
+                definevar(v)
+
+            for op in block.operations:
                 for v in op.args:
-                    assert isinstance(v, (Constant, Variable, SubOperation))
-                    if isinstance(v, SubOperation):
-                        checkop(v.op)
-                    elif isinstance(v, Variable):
+                    assert isinstance(v, (Constant, Variable))
+                    if isinstance(v, Variable):
                         usevar(v)
                     else:
                         assert v.value is not last_exception
                         #assert v.value != last_exc_value
                 if op.opname == 'direct_call':
                     assert isinstance(op.args[0], Constant)
-
-            for v in block.inputargs:
-                definevar(v)
-
-            for op in block.operations:
-                checkop(op)
                 definevar(op.result)
 
             exc_links = {}