[pypy-svn] r38129 - pypy/branch/jit-virtual-world/pypy/jit/timeshifter

[arigo at codespeak.net]

Author: arigo
Date: Thu Feb  8 00:20:16 2007
New Revision: 38129

Modified:
   pypy/branch/jit-virtual-world/pypy/jit/timeshifter/rcontainer.py
   pypy/branch/jit-virtual-world/pypy/jit/timeshifter/vlist.py
Log:
(pedronis, arigo)

Forgot this file when making the places uninitialized and
when moving the absorbs to where they belong.


Modified: pypy/branch/jit-virtual-world/pypy/jit/timeshifter/rcontainer.py
==============================================================================
--- pypy/branch/jit-virtual-world/pypy/jit/timeshifter/rcontainer.py	(original)
+++ pypy/branch/jit-virtual-world/pypy/jit/timeshifter/rcontainer.py	Thu Feb  8 00:20:16 2007
@@ -626,7 +626,6 @@
                 vrtis.append(content.make_rti(jitstate, memo))
                 j -= 1
 
-
         self.content_boxes.append(forced_box)
         return vrti
 

Modified: pypy/branch/jit-virtual-world/pypy/jit/timeshifter/vlist.py
==============================================================================
--- pypy/branch/jit-virtual-world/pypy/jit/timeshifter/vlist.py	(original)
+++ pypy/branch/jit-virtual-world/pypy/jit/timeshifter/vlist.py	Thu Feb  8 00:20:16 2007
@@ -221,10 +221,10 @@
         memo.containers[self] = vrti
 
         builder = jitstate.curbuilder
-        place = builder.alloc_frame_place(typedesc.ptrkind,
-                                          typedesc.gv_null)
-        gv_forced = builder.genop_absorb_place(typedesc.ptrkind, place)
+        place = builder.alloc_frame_place(typedesc.ptrkind)
         vrti.forced_place = place
+        forced_box = rvalue.PtrRedBox(typedesc.ptrkind)
+        memo.forced_boxes.append((forced_box, place))
 
         vars_gv = memo.framevars_gv
         varindexes = vrti.varindexes
@@ -243,9 +243,7 @@
                 vrtis.append(content.make_rti(jitstate, memo))
                 j -= 1
 
-        self.item_boxes.append(rvalue.PtrRedBox(typedesc.ptrkind,
-                                                   gv_forced))
-                
+        self.item_boxes.append(forced_box)
         return vrti
 
     def reshape(self, jitstate, shapemask, memo):