Author: Maciej Fijalkowski <[email protected]>
Branch: optresult
Changeset: r77808:de61e02e323b
Date: 2015-06-03 09:52 +0200
http://bitbucket.org/pypy/pypy/changeset/de61e02e323b/
Log: minor fixes
diff --git a/rpython/jit/backend/llgraph/runner.py
b/rpython/jit/backend/llgraph/runner.py
--- a/rpython/jit/backend/llgraph/runner.py
+++ b/rpython/jit/backend/llgraph/runner.py
@@ -427,7 +427,7 @@
except KeyError:
descr = ArrayDescr(A, self)
self.descrs[key] = descr
- if isinstance(A.OF, lltype.Struct):
+ if isinstance(A, lltype.Array) and isinstance(A.OF, lltype.Struct):
descrs = heaptracker.all_interiorfielddescrs(self,
A, get_field_descr=LLGraphCPU.interiorfielddescrof)
descr.all_interiorfielddescrs = descrs
@@ -506,7 +506,9 @@
bh_getfield_gc_f = bh_getfield_gc
bh_getfield_raw = bh_getfield_gc
- bh_getfield_raw_pure = bh_getfield_raw
+ bh_getfield_raw_pure_i = bh_getfield_raw
+ bh_getfield_raw_pure_r = bh_getfield_raw
+ bh_getfield_raw_pure_f = bh_getfield_raw
bh_getfield_raw_i = bh_getfield_raw
bh_getfield_raw_r = bh_getfield_raw
bh_getfield_raw_f = bh_getfield_raw
diff --git a/rpython/jit/metainterp/optimizeopt/pure.py
b/rpython/jit/metainterp/optimizeopt/pure.py
--- a/rpython/jit/metainterp/optimizeopt/pure.py
+++ b/rpython/jit/metainterp/optimizeopt/pure.py
@@ -101,9 +101,8 @@
if op.returns_bool_result():
self.getintbound(op).make_bool()
if save:
- realop = self.get_box_replacement(op)
- recentops = self.getrecentops(realop.getopnum())
- recentops.add(realop)
+ recentops = self.getrecentops(op.getopnum())
+ recentops.add(op)
if nextop:
self.emit_operation(nextop)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
