[pypy-commit] pypy gc-minimark-pinning: what where I thinking - fix tests

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: gc-minimark-pinning
Changeset: r55043:88c902632479
Date: 2012-05-11 18:15 +0200
http://bitbucket.org/pypy/pypy/changeset/88c902632479/

Log:	what where I thinking - fix tests

diff --git a/pypy/rpython/memory/gc/minimark.py b/pypy/rpython/memory/gc/minimark.py
--- a/pypy/rpython/memory/gc/minimark.py
+++ b/pypy/rpython/memory/gc/minimark.py
@@ -598,8 +598,8 @@
             size_gc_header = self.gcheaderbuilder.size_gc_header
             while self.nursery_barriers.non_empty() and self.nursery_free + totalsize > self.nursery_top:
                 cur_obj_size = size_gc_header + self.get_size(
-                    self.nursery_free + size_gc_header)
-                self.nursery_free = self.nursery_free + cur_obj_size
+                    self.nursery_top + size_gc_header)
+                self.nursery_free = self.nursery_top + cur_obj_size
                 self.nursery_top = self.nursery_barriers.popleft()
             if self.nursery_free + totalsize <= self.nursery_top:
                 res = self.nursery_free
@@ -1361,9 +1361,9 @@
         self.nursery_barriers.append(self.nursery + self.nursery_size)
         self.nursery_top = self.nursery_barriers.popleft()
         while self.nursery_barriers.non_empty() and self.nursery_free + min_size > self.nursery_top:
-            cur_obj_size = size_gc_header + self.get_size(self.nursery_free +
+            cur_obj_size = size_gc_header + self.get_size(self.nursery_top +
                                                           size_gc_header)
-            self.nursery_free = self.nursery_free + cur_obj_size
+            self.nursery_free = self.nursery_top + cur_obj_size
             self.nursery_top = self.nursery_barriers.popleft()
         if self.nursery_free + min_size > self.nursery_top:
             ll_assert(False, "too many pinned objects")