[pypy-commit] pypy stmgc-c7: merge heads

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: stmgc-c7
Changeset: r70287:e5c759af77bd
Date: 2014-03-25 17:48 +0100
http://bitbucket.org/pypy/pypy/changeset/e5c759af77bd/

Log:	merge heads

diff --git a/rpython/jit/backend/x86/stmtlocal.py b/rpython/jit/backend/x86/stmtlocal.py
--- a/rpython/jit/backend/x86/stmtlocal.py
+++ b/rpython/jit/backend/x86/stmtlocal.py
@@ -23,4 +23,5 @@
     'pypy__threadlocal_base',
     [], lltype.Signed,
     compilation_info=eci,
-    _nowrapper=True)
+    _nowrapper=True,
+    transactionsafe=True)
diff --git a/rpython/jit/metainterp/counter.py b/rpython/jit/metainterp/counter.py
--- a/rpython/jit/metainterp/counter.py
+++ b/rpython/jit/metainterp/counter.py
@@ -8,12 +8,15 @@
 UINT32MAX = 2 ** 32 - 1
 
 # keep in sync with the C code in pypy__decay_jit_counters
-ENTRY = lltype.Struct('timetable_entry',
-                      ('times', lltype.FixedSizeArray(rffi.FLOAT, 5)),
-                      ('subhashes', lltype.FixedSizeArray(rffi.USHORT, 5)),
-                      hints={'stm_dont_track_raw_accesses': True})
-ENTRY_ARRAY = lltype.Array(ENTRY, hints={'nolength': True,
-                                         'stm_dont_track_raw_accesses': True})
+_h = {'stm_dont_track_raw_accesses': True}
+ENTRY = lltype.Struct(
+    'timetable_entry',
+    ('times', lltype.FixedSizeArray(rffi.FLOAT, 5, hints=_h)),
+    ('subhashes', lltype.FixedSizeArray(rffi.USHORT, 5, hints=_h)),
+    hints=_h)
+ENTRY_ARRAY = lltype.Array(
+    ENTRY,
+    hints={'nolength': True, 'stm_dont_track_raw_accesses': True})
 
 
 class JitCounter:
diff --git a/rpython/translator/stm/funcgen.py b/rpython/translator/stm/funcgen.py
--- a/rpython/translator/stm/funcgen.py
+++ b/rpython/translator/stm/funcgen.py
@@ -125,7 +125,11 @@
     try:
         info = op.args[0].value
     except IndexError:
-        info = "rstm.become_inevitable"    # cannot insert it in 'llop'
+        info = "?"    # cannot insert it in 'llop'
+    try:
+        info = '%s:%s' % funcgen.graph.name
+    except AttributeError:
+        pass
     string_literal = c_string_constant(info)
     return 'stm_become_inevitable(&stm_thread_local, %s);' % (string_literal,)