[pypy-commit] pypy stm: bug fix

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: stm
Changeset: r48577:c30efe18be88
Date: 2011-10-28 18:11 +0200
http://bitbucket.org/pypy/pypy/changeset/c30efe18be88/

Log:	bug fix

diff --git a/pypy/translator/stm/src_stm/et.c b/pypy/translator/stm/src_stm/et.c
--- a/pypy/translator/stm/src_stm/et.c
+++ b/pypy/translator/stm/src_stm/et.c
@@ -698,6 +698,10 @@
      to 1. */
   struct tx_descriptor *d = thread_descriptor;
 
+#ifdef RPY_ASSERT
+  assert(d->transaction_active);
+#endif
+
   if (is_inevitable(d))
     return;  /* I am already inevitable */
 
diff --git a/pypy/translator/stm/transform.py b/pypy/translator/stm/transform.py
--- a/pypy/translator/stm/transform.py
+++ b/pypy/translator/stm/transform.py
@@ -43,7 +43,8 @@
             try:
                 meth = getattr(self, 'stt_' + op.opname)
             except AttributeError:
-                if op_in_set(op.opname, ALWAYS_ALLOW_OPERATIONS):
+                if (op_in_set(op.opname, ALWAYS_ALLOW_OPERATIONS) or
+                        op.opname.startswith('stm_')):
                     meth = list.append
                 else:
                     meth = turn_inevitable_and_proceed