[pypy-commit] pypy stmgc-c4: Import stmgc/dd0aff1663a1

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: stmgc-c4
Changeset: r65241:7d53e33d17d1
Date: 2013-07-06 21:38 +0200
http://bitbucket.org/pypy/pypy/changeset/7d53e33d17d1/

Log:	Import stmgc/dd0aff1663a1

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
@@ -133,6 +133,10 @@
     /* fast path for two equal pointers */
     if (p1 == p2)
         return 1;
+    /* if p1 or p2 is NULL (but not both, because they are different
+       pointers), then return 0 */
+    if (p1 == NULL || p2 == NULL)
+        return 0;
     /* types must be the same */
     if ((p1->h_tid & STM_USER_TID_MASK) != (p2->h_tid & STM_USER_TID_MASK))
         return 0;
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 @@
-88246694721e
+dd0aff1663a1