Author: Remi Meier <remi.me...@inf.ethz.ch>
Branch: 
Changeset: r1624:edb90028410a
Date: 2015-02-16 15:53 +0100
http://bitbucket.org/pypy/stmgc/changeset/edb90028410a/

Log:    Backed out changeset: 60f7ccae893c

diff --git a/c8/stm/gcpage.c b/c8/stm/gcpage.c
--- a/c8/stm/gcpage.c
+++ b/c8/stm/gcpage.c
@@ -96,9 +96,12 @@
 
 object_t *_stm_allocate_old(ssize_t size_rounded_up)
 {
-    /* this is for tests, and for stm_setup_prebuilt() */
+    /* only for tests xxx but stm_setup_prebuilt() uses this now too */
     stm_char *p = allocate_outside_nursery_large(size_rounded_up);
     object_t *o = (object_t *)p;
+
+    // sharing seg0 needs to be current:
+    assert(STM_SEGMENT->segment_num == 0);
     memset(REAL_ADDRESS(STM_SEGMENT->segment_base, o), 0, size_rounded_up);
     o->stm_flags = GCFLAG_WRITE_BARRIER;
 
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to