[pypy-commit] pypy gc-incminimark-pinning: passing gc/test/test_object_pinning tests, except skipped ones

[groggi]

Author: Gregor Wegberg <code at gregorwegberg.com>
Branch: gc-incminimark-pinning
Changeset: r74013:fc3eef4065bc
Date: 2014-10-18 19:34 +0200
http://bitbucket.org/pypy/pypy/changeset/fc3eef4065bc/

Log:	passing gc/test/test_object_pinning tests, except skipped ones

diff --git a/rpython/memory/gc/incminimark.py b/rpython/memory/gc/incminimark.py
--- a/rpython/memory/gc/incminimark.py
+++ b/rpython/memory/gc/incminimark.py
@@ -723,9 +723,10 @@
                             "Too many pinned objects?")
             #
             result = self.nursery_free
-            if self.nursery_free + totalsize <= self.nursery + self.nursery_size:
+            if self.nursery_free + totalsize <= self.nursery_top:
                 self.nursery_free = result + totalsize
-                ll_assert(self.nursery_free <= self.nursery + self.nursery_size, "nursery overflow")
+                ll_assert(self.nursery_free <= self.nursery_top, "nursery overflow")
+                break
             #
         #
         if self.debug_tiny_nursery >= 0:   # for debugging