[pypy-commit] pypy stmgc-c7: Add another stmdict to reduce conflicts

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: stmgc-c7
Changeset: r76487:3956536622d3
Date: 2015-03-21 10:33 +0100
http://bitbucket.org/pypy/pypy/changeset/3956536622d3/

Log:	Add another stmdict to reduce conflicts

diff --git a/rpython/annotator/bookkeeper.py b/rpython/annotator/bookkeeper.py
--- a/rpython/annotator/bookkeeper.py
+++ b/rpython/annotator/bookkeeper.py
@@ -23,6 +23,11 @@
 from rpython.tool.algo.unionfind import UnionFind
 from rpython.rtyper import extregistry
 
+try:
+    from pypystm import stmdict
+except ImportError:
+    stmdict = {}
+
 
 BUILTIN_ANALYZERS = {}
 
@@ -54,7 +59,7 @@
     def __init__(self, annotator):
         self.annotator = annotator
         self.bkTLS = TlsClass()
-        self.descs = {}          # map Python objects to their XxxDesc wrappers
+        self.descs = stmdict()  # map Python objects to their XxxDesc wrappers
         self.methoddescs = {}    # map (funcdesc, classdef) to the MethodDesc
         self.classdefs = []      # list of all ClassDefs
         self.seen_mutable = {}