[pypy-commit] pypy stmgc-c7: Fixed (I think): now accessing the raw data structure should not cause stm_become_inevitable, even

[arigo]

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

Log:	Fixed (I think): now accessing the raw data structure should not
	cause stm_become_inevitable, even though the structure has nested
	arrays

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: