Author: Armin Rigo <[email protected]>
Branch: stmgc-c7
Changeset: r70286:b6601e2ca87d
Date: 2014-03-25 17:46 +0100
http://bitbucket.org/pypy/pypy/changeset/b6601e2ca87d/
Log: Tweaks
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/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,)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
