Author: Armin Rigo <ar...@tunes.org>
Branch: copy-over-original2
Changeset: r433:b246a4e9bfb6
Date: 2013-07-24 17:15 +0200
http://bitbucket.org/pypy/stmgc/changeset/b246a4e9bfb6/
Log: Bah, no
diff --git a/c4/et.c b/c4/et.c
--- a/c4/et.c
+++ b/c4/et.c
@@ -1122,6 +1122,7 @@
| GCFLAG_STUB
| GCFLAG_SMALLSTUB
| GCFLAG_OLD;
+ dprintf(("et.c: stm_stub_malloc -> %p\n", stub));
stub->h_revision = ((revision_t)L) | 2;
assert(!(L->h_tid & GCFLAG_HAS_ID));
diff --git a/c4/et.h b/c4/et.h
--- a/c4/et.h
+++ b/c4/et.h
@@ -73,6 +73,7 @@
static const revision_t GCFLAG_PRIVATE_FROM_PROTECTED = STM_FIRST_GCFLAG << 9;
static const revision_t GCFLAG_HAS_ID = STM_FIRST_GCFLAG << 10;
static const revision_t GCFLAG_IMMUTABLE = STM_FIRST_GCFLAG << 11;
+static const revision_t GCFLAG_SMALLSTUB = STM_FIRST_GCFLAG << 12;
/* this value must be reflected in PREBUILT_FLAGS in stmgc.h */
diff --git a/c4/gcpage.c b/c4/gcpage.c
--- a/c4/gcpage.c
+++ b/c4/gcpage.c
@@ -278,7 +278,7 @@
memcpy(id_copy, obj, stmgc_size(obj));
assert(!((id_copy->h_tid ^ old_tid)
& (GCFLAG_BACKUP_COPY //| GCFLAG_STUB, id_copy may be stub
- | GCFLAG_PUBLIC | GCFLAG_HAS_ID
+ | GCFLAG_PUBLIC | GCFLAG_HAS_ID | GCFLAG_SMALLSTUB
| GCFLAG_PRIVATE_FROM_PROTECTED)));
id_copy->h_original = prehash;
id_copy->h_tid = old_tid & ~(GCFLAG_VISITED |/* will be visited next */
diff --git a/c4/steal.c b/c4/steal.c
--- a/c4/steal.c
+++ b/c4/steal.c
@@ -103,7 +103,6 @@
stub = stm_stub_malloc(sd->foreign_pd, size);
stub->h_tid = (obj->h_tid & STM_USER_TID_MASK) | GCFLAG_PUBLIC
| GCFLAG_STUB
- | GCFLAG_SMALLSTUB
| GCFLAG_OLD;
stub->h_revision = ((revision_t)obj) | 2;
if (obj->h_original) {
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
