[pypy-commit] stmgc marker: Fix the test

arigo noreply at buildbot.pypy.org
Sun May 4 16:50:08 CEST 2014


Author: Armin Rigo <arigo at tunes.org>
Branch: marker
Changeset: r1197:a62dc8720373
Date: 2014-05-04 16:47 +0200
http://bitbucket.org/pypy/stmgc/changeset/a62dc8720373/

Log:	Fix the test

diff --git a/c7/stm/nursery.c b/c7/stm/nursery.c
--- a/c7/stm/nursery.c
+++ b/c7/stm/nursery.c
@@ -244,6 +244,12 @@
     for (i = num_old + 1; i < total; i += 2) {
         minor_trace_if_young((object_t **)list_ptr_to_item(mlst, i));
     }
+    if (STM_PSEGMENT->transaction_state == TS_INEVITABLE) {
+        uintptr_t *pmarker_inev_obj = (uintptr_t *)
+            REAL_ADDRESS(STM_SEGMENT->segment_base,
+                         &STM_PSEGMENT->marker_inev[1]);
+        minor_trace_if_young((object_t **)pmarker_inev_obj);
+    }
 }
 
 static size_t throw_away_nursery(struct stm_priv_segment_info_s *pseg)


More information about the pypy-commit mailing list