[pypy-commit] pypy stmgc-c7: Re-add a line that was lost during merge (this line is the diff
arigo
noreply at buildbot.pypy.org
Wed Nov 12 11:11:14 CET 2014
Author: Armin Rigo <arigo at tunes.org>
Branch: stmgc-c7
Changeset: r74473:d327a0f4d6ba
Date: 2014-11-12 11:10 +0100
http://bitbucket.org/pypy/pypy/changeset/d327a0f4d6ba/
Log: Re-add a line that was lost during merge (this line is the diff done
to rtyper/lltypesystem/rclass.py, which was deleted)
diff --git a/rpython/rtyper/rclass.py b/rpython/rtyper/rclass.py
--- a/rpython/rtyper/rclass.py
+++ b/rpython/rtyper/rclass.py
@@ -523,6 +523,7 @@
if hints is None:
hints = {}
hints = self._check_for_immutable_hints(hints)
+ hints = self._check_for_stm_hints(hints)
kwds = {}
if self.gcflavor == 'gc':
kwds['rtti'] = True
More information about the pypy-commit
mailing list