[pypy-svn] r37568 - pypy/dist/pypy/jit/timeshifter

[ac at codespeak.net]

Author: ac
Date: Mon Jan 29 21:13:07 2007
New Revision: 37568

Modified:
   pypy/dist/pypy/jit/timeshifter/rcontainer.py
   pypy/dist/pypy/jit/timeshifter/rvirtualizable.py
Log:
(pedronis, arre) Unfixing unneeded fix.

Modified: pypy/dist/pypy/jit/timeshifter/rcontainer.py
==============================================================================
--- pypy/dist/pypy/jit/timeshifter/rcontainer.py	(original)
+++ pypy/dist/pypy/jit/timeshifter/rcontainer.py	Mon Jan 29 21:13:07 2007
@@ -132,12 +132,12 @@
 
     def _define_fill_into(self):
         descs = unrolling_iterable(self.fielddescs)
-        def fill_into(vablerti, sref, base, vrti):
+        def fill_into(vablerti, s, base, vrti):
             i = 0
             for desc in descs:
                 v = vrti._read_field(vablerti, desc, base, i)
                 i += 1
-                tgt = lltype.cast_opaque_ptr(desc.PTRTYPE, sref)
+                tgt = lltype.cast_pointer(desc.PTRTYPE, s)
                 setattr(tgt, desc.fieldname, v)
                 
         self.fill_into = fill_into

Modified: pypy/dist/pypy/jit/timeshifter/rvirtualizable.py
==============================================================================
--- pypy/dist/pypy/jit/timeshifter/rvirtualizable.py	(original)
+++ pypy/dist/pypy/jit/timeshifter/rvirtualizable.py	Mon Jan 29 21:13:07 2007
@@ -105,7 +105,7 @@
         s = lltype.malloc(S)
         sref = lltype.cast_opaque_ptr(llmemory.GCREF, s)
         forcestate[bitmask] = sref
-        fielddesc.fill_into(vablerti, sref, base, self)
+        fielddesc.fill_into(vablerti, s, base, self)
         return s
     _get_forced._annspecialcase_ = "specialize:arg(2)"