Author: Armin Rigo <ar...@tunes.org>
Branch:
Changeset: r74458:4abe9a6d1c12
Date: 2014-11-11 19:52 +0100
http://bitbucket.org/pypy/pypy/changeset/4abe9a6d1c12/
Log: Oups, an indirect conflict between two branches
diff --git a/rpython/memory/gctypelayout.py b/rpython/memory/gctypelayout.py
--- a/rpython/memory/gctypelayout.py
+++ b/rpython/memory/gctypelayout.py
@@ -78,12 +78,9 @@
return (infobits & T_IS_GCARRAY_OF_GCPTR) != 0
def q_cannot_pin(self, typeid):
- infobits = self.get(typeid).infobits
- ANY = (T_HAS_GCPTR |
- T_IS_WEAKREF |
- T_HAS_FINALIZER |
- T_HAS_LIGHTWEIGHT_FINALIZER)
- return (infobits & ANY) != 0
+ typeinfo = self.get(typeid)
+ ANY = (T_HAS_GCPTR | T_IS_WEAKREF)
+ return (typeinfo.infobits & ANY) != 0 or bool(typeinfo.finalizer)
def q_finalizer(self, typeid):
return self.get(typeid).finalizer
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
