[pypy-commit] pypy default: merge heads

[bivab]

Author: David Schneider <david.schneider at picle.org>
Branch: 
Changeset: r66083:0ef546bb8d2c
Date: 2013-08-12 02:50 -0500
http://bitbucket.org/pypy/pypy/changeset/0ef546bb8d2c/

Log:	merge heads

diff --git a/rpython/memory/gc/minimark.py b/rpython/memory/gc/minimark.py
--- a/rpython/memory/gc/minimark.py
+++ b/rpython/memory/gc/minimark.py
@@ -2046,6 +2046,8 @@
     # The code relies on the fact that no weakref can be an old object
     # weakly pointing to a young object.  Indeed, weakrefs are immutable
     # so they cannot point to an object that was created after it.
+    # Thanks to this, during a minor collection, we don't have to fix
+    # or clear the address stored in old weakrefs.
     def invalidate_young_weakrefs(self):
         """Called during a nursery collection."""
         # walk over the list of objects that contain weakrefs and are in the