Author: Armin Rigo <ar...@tunes.org>
Branch:
Changeset: r48622:76c3245ed214
Date: 2011-10-31 17:24 +0100
http://bitbucket.org/pypy/pypy/changeset/76c3245ed214/
Log: merge heads
diff --git a/pypy/rpython/memory/gc/semispace.py
b/pypy/rpython/memory/gc/semispace.py
--- a/pypy/rpython/memory/gc/semispace.py
+++ b/pypy/rpython/memory/gc/semispace.py
@@ -105,9 +105,10 @@
llarena.arena_reserve(result, totalsize)
self.init_gc_object(result, typeid16)
self.free = result + totalsize
- if is_finalizer_light:
- self.objects_with_light_finalizers.append(result + size_gc_header)
- elif has_finalizer:
+ #if is_finalizer_light:
+ # self.objects_with_light_finalizers.append(result + size_gc_header)
+ #else:
+ if has_finalizer:
self.objects_with_finalizers.append(result + size_gc_header)
if contains_weakptr:
self.objects_with_weakrefs.append(result + size_gc_header)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
