[pypy-svn] r31478 - in pypy/dist/pypy: jit/llabstractinterp rpython

[arigo at codespeak.net]

Author: arigo
Date: Tue Aug 22 16:32:32 2006
New Revision: 31478

Modified:
   pypy/dist/pypy/jit/llabstractinterp/llabstractinterp.py
   pypy/dist/pypy/rpython/rgenop.py
Log:
(pedronis, arigo)
Removed unused argument.


Modified: pypy/dist/pypy/jit/llabstractinterp/llabstractinterp.py
==============================================================================
--- pypy/dist/pypy/jit/llabstractinterp/llabstractinterp.py	(original)
+++ pypy/dist/pypy/jit/llabstractinterp/llabstractinterp.py	Tue Aug 22 16:32:32 2006
@@ -597,8 +597,7 @@
 
     def residual_direct_call(self, FUNCTYPE, name, target, args_a):
         T = FUNCTYPE.RESULT
-        gen_fn_const = rgenop.gencallableconst(self.newblock,
-                                               name,
+        gen_fn_const = rgenop.gencallableconst(name,
                                                target,
                                                rgenop.constTYPE(FUNCTYPE))
         retvar = self.genop('direct_call', [gen_fn_const] +

Modified: pypy/dist/pypy/rpython/rgenop.py
==============================================================================
--- pypy/dist/pypy/rpython/rgenop.py	(original)
+++ pypy/dist/pypy/rpython/rgenop.py	Tue Aug 22 16:32:32 2006
@@ -69,7 +69,7 @@
     block.operations.append(op)
     return to_opaque_object(v)
 
-def gencallableconst(blockcontainer, name, targetcontainer, gv_FUNCTYPE):
+def gencallableconst(name, targetcontainer, gv_FUNCTYPE):
     # is name useful, is it runtime variable?
     target = from_opaque_object(targetcontainer.obj)
     FUNCTYPE = from_opaque_object(gv_FUNCTYPE).value
@@ -297,6 +297,7 @@
 setannotation(initblock, None)
 setannotation(geninputarg, s_ConstOrVar)
 setannotation(genop, s_ConstOrVar)
+setannotation(gencallableconst, s_ConstOrVar)
 setannotation(genconst, s_ConstOrVar)
 setannotation(revealconst, lambda s_T, s_gv: annmodel.lltype_to_annotation(
                                                   s_T.const))