Author: Armin Rigo <[email protected]>
Branch: stmgc-static-barrier
Changeset: r66156:fe0fc22afd10
Date: 2013-08-14 19:24 +0200
http://bitbucket.org/pypy/pypy/changeset/fe0fc22afd10/
Log: import stmgc/edbd90784082
diff --git a/rpython/translator/stm/src_stm/extra.c
b/rpython/translator/stm/src_stm/extra.c
--- a/rpython/translator/stm/src_stm/extra.c
+++ b/rpython/translator/stm/src_stm/extra.c
@@ -163,7 +163,7 @@
return 1;
/* the only possible case to still get True is if p2 == p1->h_original */
- return (p1 != NULL) && (p1->h_original == p2) &&
+ return (p1 != NULL) && (p1->h_original == (revision_t)p2) &&
!(p1->h_tid & GCFLAG_PREBUILT_ORIGINAL);
}
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 @@
-9dc18268f0da
+edbd90784082
diff --git a/rpython/translator/stm/src_stm/stmgc.h
b/rpython/translator/stm/src_stm/stmgc.h
--- a/rpython/translator/stm/src_stm/stmgc.h
+++ b/rpython/translator/stm/src_stm/stmgc.h
@@ -178,6 +178,9 @@
extern __thread revision_t stm_private_rev_num;
gcptr stm_DirectReadBarrier(gcptr);
gcptr stm_WriteBarrier(gcptr);
+gcptr stm_RepeatReadBarrier(gcptr);
+gcptr stm_ImmutReadBarrier(gcptr);
+gcptr stm_RepeatWriteBarrier(gcptr);
static const revision_t GCFLAG_PUBLIC_TO_PRIVATE = STM_FIRST_GCFLAG << 4;
static const revision_t GCFLAG_WRITE_BARRIER = STM_FIRST_GCFLAG << 5;
static const revision_t GCFLAG_MOVED = STM_FIRST_GCFLAG << 6;
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
