Author: Maciej Fijalkowski <fij...@gmail.com>
Branch: optresult-unroll
Changeset: r79157:c3bc8ad8a836
Date: 2015-08-23 17:16 +0200
http://bitbucket.org/pypy/pypy/changeset/c3bc8ad8a836/
Log: small fixes
diff --git a/rpython/jit/metainterp/optimizeopt/unroll.py
b/rpython/jit/metainterp/optimizeopt/unroll.py
--- a/rpython/jit/metainterp/optimizeopt/unroll.py
+++ b/rpython/jit/metainterp/optimizeopt/unroll.py
@@ -167,7 +167,8 @@
continue
try:
extra_guards = target_virtual_state.generate_guards(
- virtual_state, args, infos, self.optimizer.cpu)
+ virtual_state, jump_op.getarglist(), infos,
+ self.optimizer.cpu)
assert not extra_guards.extra_guards
except VirtualStatesCantMatch:
continue
diff --git a/rpython/jit/metainterp/optimizeopt/virtualstate.py
b/rpython/jit/metainterp/optimizeopt/virtualstate.py
--- a/rpython/jit/metainterp/optimizeopt/virtualstate.py
+++ b/rpython/jit/metainterp/optimizeopt/virtualstate.py
@@ -347,7 +347,8 @@
extra_guards = state.extra_guards
cpu = state.cpu
- if self.lenbound and not self.lenbound.contains_bound(other.lenbound):
+ if (self.lenbound and other.lenbound and
+ not self.lenbound.contains_bound(other.lenbound)):
raise VirtualStatesCantMatch("length bound does not match")
if self.level == LEVEL_UNKNOWN:
diff --git a/rpython/jit/metainterp/test/test_ajit.py
b/rpython/jit/metainterp/test/test_ajit.py
--- a/rpython/jit/metainterp/test/test_ajit.py
+++ b/rpython/jit/metainterp/test/test_ajit.py
@@ -1428,7 +1428,7 @@
res = self.meta_interp(f, [6, 7])
assert res == 42
self.check_trace_count(1)
- self.check_resops(call=2)
+ self.check_resops(call_r=2)
def test_merge_guardclass_guardvalue(self):
myjitdriver = JitDriver(greens = [], reds = ['x', 'l'])
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
