[pypy-svn] r65005 - pypy/branch/pyjitpl5/pypy/rpython/lltypesystem

[fijal at codespeak.net]

Author: fijal
Date: Sun May  3 18:42:03 2009
New Revision: 65005

Modified:
   pypy/branch/pyjitpl5/pypy/rpython/lltypesystem/ll2ctypes.py
Log:
Even more incredible hack to cooperate with llhelpers. I think the chance
that random callback raises LLException is small, although maybe
we should come up with something saner at some point....


Modified: pypy/branch/pyjitpl5/pypy/rpython/lltypesystem/ll2ctypes.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/rpython/lltypesystem/ll2ctypes.py	(original)
+++ pypy/branch/pyjitpl5/pypy/rpython/lltypesystem/ll2ctypes.py	Sun May  3 18:42:03 2009
@@ -564,12 +564,22 @@
                         raise AssertionError
                     llinterp = LLInterpreter.current_interpreter
                     try:
+                        import pdb
+                        pdb.set_trace()
                         llres = llinterp.eval_graph(container.graph, llargs)
                     except LLException, lle:
                         llinterp._store_exception(lle)
                         return 0
+                    except:
+                        import pdb
+                        pdb.set_trace()
                 else:
-                    llres = container._callable(*llargs)
+                    try:
+                        llres = container._callable(*llargs)
+                    except LLException, lle:
+                        llinterp = LLInterpreter.current_interpreter
+                        llinterp._store_exception(lle)
+                        return 0
                 assert lltype.typeOf(llres) == T.TO.RESULT
                 if T.TO.RESULT is lltype.Void:
                     return None