Author: Maciej Fijalkowski <[email protected]>
Branch: optresult-unroll
Changeset: r79402:853555a3255f
Date: 2015-09-03 20:23 +0200
http://bitbucket.org/pypy/pypy/changeset/853555a3255f/
Log: fix for raw buffer tests
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
@@ -304,8 +304,9 @@
return box
if box.type == 'i':
info = self.getrawptrinfo(box)
- return info.force_at_the_end_of_preamble(box, self.optearlyforce,
- None)
+ if info is not None:
+ return info.force_at_the_end_of_preamble(box,
+ self.optearlyforce, None)
return box
def flush(self):
diff --git a/rpython/jit/metainterp/test/test_virtual.py
b/rpython/jit/metainterp/test/test_virtual.py
--- a/rpython/jit/metainterp/test/test_virtual.py
+++ b/rpython/jit/metainterp/test/test_virtual.py
@@ -1234,7 +1234,7 @@
res = self.meta_interp(f, [10])
assert res == 55
self.check_trace_count(1)
- self.check_resops(setarrayitem_raw=2, getarrayitem_raw=4)
+ self.check_resops(setarrayitem_raw=2, getarrayitem_raw_i=4)
# ____________________________________________________________
# Run 1: all the tests instantiate a real RPython class
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
