[pypy-commit] pypy stmgc-c7: fixes

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: stmgc-c7
Changeset: r75783:6819c000c078
Date: 2015-02-09 18:24 +0100
http://bitbucket.org/pypy/pypy/changeset/6819c000c078/

Log:	fixes

diff --git a/rpython/rtyper/rlist.py b/rpython/rtyper/rlist.py
--- a/rpython/rtyper/rlist.py
+++ b/rpython/rtyper/rlist.py
@@ -57,7 +57,8 @@
                 return FixedSizeListRepr(rtyper, item_repr, listitem)
 
     def rtyper_makekey(self):
-        self.listdef.listitem.dont_change_any_more = True
+        if not self.listdef.listitem.dont_change_any_more:
+            self.listdef.listitem.dont_change_any_more = True
         return self.__class__, self.listdef.listitem
 
 
diff --git a/rpython/rtyper/rtyper.py b/rpython/rtyper/rtyper.py
--- a/rpython/rtyper/rtyper.py
+++ b/rpython/rtyper/rtyper.py
@@ -48,6 +48,10 @@
         self.reprs = stmdict()
         self._seen_reprs_must_call_setup = stmset()
         self._all_lists_must_call_setup = []
+        try:
+            del annmodel.TLS._reprs_must_call_setup
+        except AttributeError:
+            pass
         self._dict_traits = {}
         self.rootclass_repr = RootClassRepr(self)
         self.rootclass_repr.setup()
@@ -306,10 +310,7 @@
         while True:
             if all_threads:
                 lsts = self._all_lists_must_call_setup
-                for lst in lsts:
-                    if lst:
-                        break
-                else:
+                if not any(lsts):
                     return      # nothing to do
             else:
                 lst = self._list_must_call_setup()