Author: Maciej Fijalkowski <fij...@gmail.com>
Branch: share-guard-info
Changeset: r79667:5b0ebf3c8f4f
Date: 2015-09-17 14:00 +0200
http://bitbucket.org/pypy/pypy/changeset/5b0ebf3c8f4f/
Log: fix the case of sharing descrs from preamble
diff --git a/rpython/jit/metainterp/optimizeopt/optimizer.py
b/rpython/jit/metainterp/optimizeopt/optimizer.py
--- a/rpython/jit/metainterp/optimizeopt/optimizer.py
+++ b/rpython/jit/metainterp/optimizeopt/optimizer.py
@@ -572,7 +572,7 @@
return
else:
guard_op = self.replace_op_with(op, op.getopnum())
- if self._last_guard_op:
+ if self._last_guard_op and guard_op.getdescr() is None:
op = self._copy_resume_data_from(guard_op,
self._last_guard_op)
else:
diff --git a/rpython/jit/metainterp/test/test_loop.py
b/rpython/jit/metainterp/test/test_loop.py
--- a/rpython/jit/metainterp/test/test_loop.py
+++ b/rpython/jit/metainterp/test/test_loop.py
@@ -1088,7 +1088,7 @@
return s
self.meta_interp(f, [30])
- self.check_trace_count(4)
+ self.check_trace_count(3)
class TestLLtype(LoopTest, LLJitMixin):
pass
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
