Author: Maciej Fijalkowski <fij...@gmail.com> Branch: gc-minimark-pinning Changeset: r54596:a21db6fede56 Date: 2012-04-20 19:47 +0200 http://bitbucket.org/pypy/pypy/changeset/a21db6fede56/
Log: merge diff --git a/pypy/rpython/memory/gc/minimark.py b/pypy/rpython/memory/gc/minimark.py --- a/pypy/rpython/memory/gc/minimark.py +++ b/pypy/rpython/memory/gc/minimark.py @@ -810,8 +810,9 @@ self.header(obj).tid |= GCFLAG_PINNED def unpin(self, obj): - self.pinned_objects_in_nursery -= 1 - self.header(obj).tid &= ~GCFLAG_PINNED + if self.header(obj).tid & GCFLAG_PINNED: + self.pinned_objects_in_nursery -= 1 + self.header(obj).tid &= ~GCFLAG_PINNED def shrink_array(self, obj, smallerlength): # _______________________________________________ pypy-commit mailing list pypy-commit@python.org http://mail.python.org/mailman/listinfo/pypy-commit