Author: Maciej Fijalkowski <[email protected]>
Branch: result-in-resops
Changeset: r57576:e8ce09b33a6b
Date: 2012-09-25 14:20 +0200
http://bitbucket.org/pypy/pypy/changeset/e8ce09b33a6b/
Log: minor fixes
diff --git a/pypy/jit/metainterp/optimizeopt/heap.py
b/pypy/jit/metainterp/optimizeopt/heap.py
--- a/pypy/jit/metainterp/optimizeopt/heap.py
+++ b/pypy/jit/metainterp/optimizeopt/heap.py
@@ -447,12 +447,13 @@
indexvalue = self.getvalue(op.getarg(1))
cf = None
if indexvalue.is_constant():
- arrayvalue.make_len_gt(MODE_ARRAY, op.getdescr(),
indexvalue.box.getint())
+ arrayvalue.make_len_gt(MODE_ARRAY, op.getdescr(),
+ indexvalue.op.getint())
# use the cache on (arraydescr, index), which is a constant
- cf = self.arrayitem_cache(op.getdescr(), indexvalue.box.getint())
+ cf = self.arrayitem_cache(op.getdescr(), indexvalue.op.getint())
fieldvalue = cf.getfield_from_cache(self, arrayvalue)
if fieldvalue is not None:
- self.make_equal_to(op.result, fieldvalue)
+ self.replace(op, fieldvalue.op)
return
else:
# variable index, so make sure the lazy setarrayitems are done
diff --git a/pypy/jit/metainterp/optimizeopt/optimizer.py
b/pypy/jit/metainterp/optimizeopt/optimizer.py
--- a/pypy/jit/metainterp/optimizeopt/optimizer.py
+++ b/pypy/jit/metainterp/optimizeopt/optimizer.py
@@ -661,7 +661,8 @@
indexvalue = self.getvalue(op.getarg(1))
if indexvalue.is_constant():
arrayvalue = self.getvalue(op.getarg(0))
- arrayvalue.make_len_gt(MODE_ARRAY, op.getdescr(),
indexvalue.box.getint())
+ arrayvalue.make_len_gt(MODE_ARRAY, op.getdescr(),
+ indexvalue.op.getint())
self.optimize_default(op)
optimize_GETARRAYITEM_GC_PURE_f = optimize_GETARRAYITEM_GC_PURE_i
optimize_GETARRAYITEM_GC_PURE_p = optimize_GETARRAYITEM_GC_PURE_i
diff --git a/pypy/jit/metainterp/optimizeopt/test/test_optimizebasic.py
b/pypy/jit/metainterp/optimizeopt/test/test_optimizebasic.py
--- a/pypy/jit/metainterp/optimizeopt/test/test_optimizebasic.py
+++ b/pypy/jit/metainterp/optimizeopt/test/test_optimizebasic.py
@@ -1512,7 +1512,7 @@
[p1, i1]
setfield_gc(p1, i1, descr=valuedescr)
escape()
- i2 = getfield_gc(p1, descr=valuedescr)
+ i2 = getfield_gc_i(p1, descr=valuedescr)
escape(i2)
jump(p1, i1)
"""
@@ -1536,7 +1536,7 @@
ops = """
[p1, i1, i3]
setfield_gc(p1, i1, descr=valuedescr)
- i2 = getfield_gc(p1, descr=valuedescr)
+ i2 = getfield_gc_i(p1, descr=valuedescr)
setfield_gc(p1, i3, descr=valuedescr)
escape(i2)
jump(p1, i1, i3)
@@ -1553,7 +1553,7 @@
ops = """
[p1, p2, i1, i3]
setfield_gc(p1, i1, descr=valuedescr)
- i2 = getfield_gc(p2, descr=valuedescr)
+ i2 = getfield_gc_i(p2, descr=valuedescr)
setfield_gc(p1, i3, descr=valuedescr)
escape(i2)
jump(p1, p2, i1, i3)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
