Author: Armin Rigo <ar...@tunes.org>
Branch: stmgc-c7
Changeset: r70140:5e13c2ff77d6
Date: 2014-03-21 07:48 +0100
http://bitbucket.org/pypy/pypy/changeset/5e13c2ff77d6/
Log: Un-comment-out the implementation of stm_ignored, even if right now
it's not used
diff --git a/rpython/memory/gctransform/stmframework.py
b/rpython/memory/gctransform/stmframework.py
--- a/rpython/memory/gctransform/stmframework.py
+++ b/rpython/memory/gctransform/stmframework.py
@@ -53,13 +53,13 @@
"unbalanced stm_ignore_start/stm_ignore_stop in block")
def gct_stm_ignored_start(self, hop):
- #assert not self.in_stm_ignored
- #self.in_stm_ignored = True
+ assert not self.in_stm_ignored
+ self.in_stm_ignored = True
self.default(hop)
def gct_stm_ignored_stop(self, hop):
- #assert self.in_stm_ignored
- #self.in_stm_ignored = False
+ assert self.in_stm_ignored
+ self.in_stm_ignored = False
self.default(hop)
def var_needs_set_transform(self, var):
diff --git a/rpython/translator/stm/readbarrier.py
b/rpython/translator/stm/readbarrier.py
--- a/rpython/translator/stm/readbarrier.py
+++ b/rpython/translator/stm/readbarrier.py
@@ -76,11 +76,11 @@
[op.args[0]], v_none))
transformer.read_barrier_counts += 1
elif op.opname == 'stm_ignored_start':
- pass #assert stm_ignored == False
- #stm_ignored = True
+ assert stm_ignored == False
+ stm_ignored = True
elif op.opname == 'stm_ignored_stop':
- pass #assert stm_ignored == True
- #stm_ignored = False
+ assert stm_ignored == True
+ stm_ignored = False
newops.append(op)
assert stm_ignored == False
block.operations = newops
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
