[pypy-svn] r21767 - pypy/dist/pypy/rpython

[cfbolz at codespeak.net]

Author: cfbolz
Date: Sat Jan  7 00:05:17 2006
New Revision: 21767

Modified:
   pypy/dist/pypy/rpython/rpbc.py
   pypy/dist/pypy/rpython/rptr.py
Log:
use inputconst instead of constructing the Constant by hand -- thanks Samuele


Modified: pypy/dist/pypy/rpython/rpbc.py
==============================================================================
--- pypy/dist/pypy/rpython/rpbc.py	(original)
+++ pypy/dist/pypy/rpython/rpbc.py	Sat Jan  7 00:05:17 2006
@@ -315,10 +315,7 @@
         if isinstance(vlist[0], Constant):
             v = hop.genop('direct_call', vlist, resulttype = rresult)
         else:
-            print row_of_graphs
-            c = Constant(row_of_graphs.values())
-            c.concretetype = Void
-            vlist.append(c)
+            vlist.append(hop.inputconst(Void, row_of_graphs.values()))
             v = hop.genop('indirect_call', vlist, resulttype = rresult)
         return hop.llops.convertvar(v, rresult, hop.r_result)
 

Modified: pypy/dist/pypy/rpython/rptr.py
==============================================================================
--- pypy/dist/pypy/rpython/rptr.py	(original)
+++ pypy/dist/pypy/rpython/rptr.py	Sat Jan  7 00:05:17 2006
@@ -65,9 +65,7 @@
             opname = 'direct_call'
         else:
             opname = 'indirect_call'
-            c = flowmodel.Constant(None)
-            c.concretetype = Void
-            vlist.append(c)
+            vlist.append(hop.inputconst(Void, None))
         hop.exception_is_here()
         return hop.genop(opname, vlist,
                          resulttype = self.lowleveltype.TO.RESULT)