[pypy-commit] pypy stmgc-c8: import stmgc 8ca689687bfa

[Raemi]

Author: Remi Meier <remi.meier at gmail.com>
Branch: stmgc-c8
Changeset: r76195:3d008eb21392
Date: 2015-02-28 12:18 +0100
http://bitbucket.org/pypy/pypy/changeset/3d008eb21392/

Log:	import stmgc 8ca689687bfa

diff --git a/rpython/translator/stm/src_stm/revision b/rpython/translator/stm/src_stm/revision
--- a/rpython/translator/stm/src_stm/revision
+++ b/rpython/translator/stm/src_stm/revision
@@ -1,1 +1,1 @@
-17b08c18f7b4
+8ca689687bfa
diff --git a/rpython/translator/stm/src_stm/stm/core.c b/rpython/translator/stm/src_stm/stm/core.c
--- a/rpython/translator/stm/src_stm/stm/core.c
+++ b/rpython/translator/stm/src_stm/stm/core.c
@@ -978,6 +978,9 @@
     struct stm_read_marker_s *cards = get_read_marker(STM_SEGMENT->segment_base,
                                                       (uintptr_t)obj);
     uintptr_t card_index = get_index_to_card_index(index);
+    if (cards[card_index].rm == CARD_MARKED)
+        return;
+
     if (!IS_OVERFLOW_OBJ(STM_PSEGMENT, obj)
         && !(cards[card_index].rm == CARD_MARKED
              || cards[card_index].rm == STM_SEGMENT->transaction_read_version)) {