[pypy-svn] r73507 - in pypy/branch/cpython-extension/pypy/translator: . test

[xoraxax at codespeak.net]

Author: xoraxax
Date: Wed Apr  7 16:08:58 2010
New Revision: 73507

Modified:
   pypy/branch/cpython-extension/pypy/translator/driver.py
   pypy/branch/cpython-extension/pypy/translator/test/test_unsimplify.py
   pypy/branch/cpython-extension/pypy/translator/unsimplify.py
Log:
Fix call_final_function to handle cases where the entry_point is not the first graph annotated.

Modified: pypy/branch/cpython-extension/pypy/translator/driver.py
==============================================================================
--- pypy/branch/cpython-extension/pypy/translator/driver.py	(original)
+++ pypy/branch/cpython-extension/pypy/translator/driver.py	Wed Apr  7 16:08:58 2010
@@ -324,6 +324,7 @@
 
         if self.entry_point:
             s = annotator.build_types(self.entry_point, self.inputtypes)
+            translator.entry_point_graph = annotator.bookkeeper.getdesc(self.entry_point).getuniquegraph()
         else:
             s = None
 

Modified: pypy/branch/cpython-extension/pypy/translator/test/test_unsimplify.py
==============================================================================
--- pypy/branch/cpython-extension/pypy/translator/test/test_unsimplify.py	(original)
+++ pypy/branch/cpython-extension/pypy/translator/test/test_unsimplify.py	Wed Apr  7 16:08:58 2010
@@ -9,6 +9,7 @@
 def translate(func, argtypes, type_system="lltype"):
     t = TranslationContext()
     t.buildannotator().build_types(func, argtypes)
+    t.entry_point_graph = graphof(t, func)
     t.buildrtyper(type_system=type_system).specialize()
     return graphof(t, func), t
 

Modified: pypy/branch/cpython-extension/pypy/translator/unsimplify.py
==============================================================================
--- pypy/branch/cpython-extension/pypy/translator/unsimplify.py	(original)
+++ pypy/branch/cpython-extension/pypy/translator/unsimplify.py	Wed Apr  7 16:08:58 2010
@@ -168,7 +168,7 @@
     if own_annhelper:
         annhelper.finish()
 
-    entry_point = translator.graphs[0]
+    entry_point = translator.entry_point_graph
     v = copyvar(translator.annotator, entry_point.getreturnvar())
     extrablock = Block([v])
     v_none = varoftype(lltype.Void)