[pypy-commit] pypy jitframe-on-heap: Better safe than sorry: fall back to initial_size=nursery_size if

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: jitframe-on-heap
Changeset: r61827:236f1d990238
Date: 2013-02-26 12:57 +0100
http://bitbucket.org/pypy/pypy/changeset/236f1d990238/

Log:	Better safe than sorry: fall back to initial_size=nursery_size if
	numbers overflow, or if we want a tiny nursery.

diff --git a/rpython/memory/gc/minimark.py b/rpython/memory/gc/minimark.py
--- a/rpython/memory/gc/minimark.py
+++ b/rpython/memory/gc/minimark.py
@@ -397,7 +397,8 @@
         # value of nursery_cleanup.
         self.initial_cleanup = self.nursery_cleanup + (
                 self.nursery_size % self.nursery_cleanup)
-        if self.initial_cleanup > self.nursery_size:
+        if (r_uint(self.initial_cleanup) > r_uint(self.nursery_size) or
+            self.debug_tiny_nursery >= 0):
             self.initial_cleanup = self.nursery_size
 
     def _nursery_memory_size(self):