[pypy-svn] r19558 - pypy/dist/pypy/rpython/lltypesystem

arigo at codespeak.net arigo at codespeak.net
Sat Nov 5 16:29:34 CET 2005


Author: arigo
Date: Sat Nov  5 16:29:33 2005
New Revision: 19558

Modified:
   pypy/dist/pypy/rpython/lltypesystem/rpbc.py
Log:
A bit more correct than before, but the difference cannot be tested :-/
This bug only showed up when we tried to push the rtyper to force it
to produce explicit space pointers -- which doesn't work after all
anyway, because it's still too clever and it's not really using this
forced space pointer -- it's reading the global constant space all the
time.

I guess this ends the targetmultiplespaces.py tentative for now...



Modified: pypy/dist/pypy/rpython/lltypesystem/rpbc.py
==============================================================================
--- pypy/dist/pypy/rpython/lltypesystem/rpbc.py	(original)
+++ pypy/dist/pypy/rpython/lltypesystem/rpbc.py	Sat Nov  5 16:29:33 2005
@@ -157,7 +157,8 @@
         hop2.args_s[0] = self.s_im_self   # make the 1st arg stand for 'im_self'
         hop2.args_r[0] = self.r_im_self   # (same lowleveltype as 'self')
         if isinstance(hop2.args_v[0], Constant):
-            hop2.args_v[0] = hop.inputarg(self, 0)
+            boundmethod = hop2.args_v[0].value
+            hop2.args_v[0] = Constant(boundmethod.im_self)
         if call_args:
             hop2.swap_fst_snd_args()
             _, s_shape = hop2.r_s_popfirstarg() # temporarely remove shape



More information about the Pypy-commit mailing list