Author: Stefan Beyer <[email protected]>
Branch: cpyext-gc-cycle
Changeset: r97594:aad1bca0736f
Date: 2019-09-23 14:58 +0200
http://bitbucket.org/pypy/pypy/changeset/aad1bca0736f/
Log: Cleaned up and moved code
diff --git a/rpython/memory/gc/rrc/base.py b/rpython/memory/gc/rrc/base.py
--- a/rpython/memory/gc/rrc/base.py
+++ b/rpython/memory/gc/rrc/base.py
@@ -719,11 +719,6 @@
gchdr.c_gc_refs >> self.RAWREFCOUNT_REFS_SHIFT,
"refcnt", pyobj.c_ob_refcnt,
"link", intobj)
- #if intobj: TODO fix
- # obj = llmemory.cast_int_to_adr(intobj)
- # marked = self.header(obj).tid & \
- # (GCFLAG_VISITED | GCFLAG_NO_HEAP_PTRS)
- # debug_print(" linked obj", obj, ": marked", marked)
ll_assert(gchdr.c_gc_next != lltype.nullptr(self.PYOBJ_GC_HDR),
"gc_next is null")
diff --git a/rpython/memory/gc/rrc/incmark.py b/rpython/memory/gc/rrc/incmark.py
--- a/rpython/memory/gc/rrc/incmark.py
+++ b/rpython/memory/gc/rrc/incmark.py
@@ -43,6 +43,8 @@
self._debug_print_snap(print_label="roots-marked")
self._debug_check_consistency(print_label="roots-marked")
+
+ self._gc_list_init(self.pyobj_old_list)
self.state = self.STATE_MARKING
return False
@@ -224,7 +226,6 @@
# refcount > 0
def _mark_rawrefcount(self):
- self._gc_list_init(self.pyobj_old_list) # TODO: move???
# as long as new objects with cyclic a refcount > 0 or alive border
# objects are found, increment the refcount of all referenced objects
# of those newly found objects
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
