[pypy-svn] r64695 - pypy/branch/pyjitpl5/pypy/jit/backend/x86

arigo at codespeak.net arigo at codespeak.net
Sun Apr 26 17:18:35 CEST 2009


Author: arigo
Date: Sun Apr 26 17:18:34 2009
New Revision: 64695

Modified:
   pypy/branch/pyjitpl5/pypy/jit/backend/x86/runner.py
Log:
Minor clean-up.


Modified: pypy/branch/pyjitpl5/pypy/jit/backend/x86/runner.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/backend/x86/runner.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/backend/x86/runner.py	Sun Apr 26 17:18:34 2009
@@ -263,7 +263,7 @@
             ResOperation(rop.CALL, args, result, calldescr),
             ResOperation(rop.GUARD_NO_EXCEPTION, [], None),
             ResOperation(rop.FAIL, [result], None)]
-        operations[1].suboperations = [ResOperation(rop.FAIL, [result], None)]
+        operations[1].suboperations = [ResOperation(rop.FAIL, [], None)]
         loop = history.TreeLoop('call')
         loop.inputargs = args
         loop.operations = operations
@@ -558,7 +558,9 @@
         num_args, size, ptr = self.unpack_calldescr(calldescr)
         assert isinstance(calldescr, ConstDescr3)
         loop = self._get_loop_for_call(num_args, calldescr, ptr)
-        op = self.execute_operations(loop, args)
+        self.execute_operations(loop, args)
+        # Note: if an exception is set, the rest of the code does a bit of
+        # nonsense but nothing wrong (the return value should be ignored)
         if size == 0:
             return None
         elif ptr:



More information about the Pypy-commit mailing list