[pypy-svn] r63837 - pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp

[antocuni at codespeak.net]

Author: antocuni
Date: Wed Apr  8 16:29:53 2009
New Revision: 63837

Modified:
   pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/codewriter.py
Log:
more ootype friendliness, but tests still fail


Modified: pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/codewriter.py
==============================================================================
--- pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/codewriter.py	(original)
+++ pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/codewriter.py	Wed Apr  8 16:29:53 2009
@@ -8,6 +8,7 @@
 from pypy.jit.metainterp.history import Const, getkind
 from pypy.jit.metainterp import heaptracker, support, history
 from pypy.tool.udir import udir
+from pypy.translator.simplify import get_funcobj, get_functype
 
 import py, sys
 from pypy.tool.ansi_print import ansi_log
@@ -150,9 +151,10 @@
         NON_VOID_ARGS = [x.concretetype for x in non_void_args]
         RESULT = result.concretetype
         # check the number and type of arguments
-        ARGS = v_func.concretetype.TO.ARGS
+        FUNC = get_functype(v_func.concretetype)
+        ARGS = FUNC.ARGS
         assert NON_VOID_ARGS == [T for T in ARGS if T is not lltype.Void]
-        assert RESULT == v_func.concretetype.TO.RESULT
+        assert RESULT == FUNC.RESULT
         # ok
         calldescr = self.cpu.calldescrof(NON_VOID_ARGS, RESULT)
         return calldescr, non_void_args