[pypy-commit] pypy gc-incminimark-pinning: fix for tests 'test_malloc_different_types' and 'test_tagged_id'. fijal solved it.

groggi noreply at buildbot.pypy.org
Tue Aug 19 16:35:46 CEST 2014


Author: Gregor Wegberg <code at gregorwegberg.com>
Branch: gc-incminimark-pinning
Changeset: r72907:887cbc99da9b
Date: 2014-08-19 16:00 +0200
http://bitbucket.org/pypy/pypy/changeset/887cbc99da9b/

Log:	fix for tests 'test_malloc_different_types' and 'test_tagged_id'.
	fijal solved it.

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
@@ -617,7 +617,7 @@
             # Get the memory from the nursery.  If there is not enough space
             # there, do a collect first.
             result = self.nursery_free
-            self.nursery_free = result + totalsize
+            self.nursery_free = result + rawtotalsize
             if self.nursery_free > self.nursery_top:
                 result = self.collect_and_reserve(result, totalsize)
             #


More information about the pypy-commit mailing list