[pypy-commit] stmgc c8-small-uniform: another small fix

Raemi noreply at buildbot.pypy.org
Wed Nov 12 14:45:14 CET 2014


Author: Remi Meier <remi.meier at inf.ethz.ch>
Branch: c8-small-uniform
Changeset: r1508:f9126a9cb713
Date: 2014-11-12 14:02 +0100
http://bitbucket.org/pypy/stmgc/changeset/f9126a9cb713/

Log:	another small fix

diff --git a/c8/stm/core.c b/c8/stm/core.c
--- a/c8/stm/core.c
+++ b/c8/stm/core.c
@@ -984,6 +984,7 @@
     OPT_ASSERT(obj_size >= 16);
 
     if (LIKELY(is_small_uniform(obj))) {
+        OPT_ASSERT(obj_size <= GC_LAST_SMALL_SIZE);
         _synchronize_fragment((stm_char *)obj, obj_size);
         return;
     }
diff --git a/c8/stm/smallmalloc.c b/c8/stm/smallmalloc.c
--- a/c8/stm/smallmalloc.c
+++ b/c8/stm/smallmalloc.c
@@ -60,7 +60,7 @@
             goto out_of_memory;
 
         uninitialized_page_stop -= decrease_by;
-        first_small_uniform_loc = uninitialized_page_stop - stm_file_pages;
+        first_small_uniform_loc = uninitialized_page_stop - stm_file_pages + END_NURSERY_PAGE * 4096UL;
 
         /* XXX: */
         /* char *base = stm_object_pages + END_NURSERY_PAGE * 4096UL; */


More information about the pypy-commit mailing list