Author: Armin Rigo <ar...@tunes.org>
Branch:
Changeset: r69099:966942db58df
Date: 2014-02-08 11:13 +0100
http://bitbucket.org/pypy/pypy/changeset/966942db58df/
Log: Backout b58a2c01fd59, adding this check again. I'm not sure, but I
think it should be fixed by 3a0ef8f31265.
diff --git a/rpython/jit/metainterp/pyjitpl.py
b/rpython/jit/metainterp/pyjitpl.py
--- a/rpython/jit/metainterp/pyjitpl.py
+++ b/rpython/jit/metainterp/pyjitpl.py
@@ -594,11 +594,9 @@
if tobox is not None:
# sanity check: see whether the current struct value
# corresponds to what the cache thinks the value is
- # XXX pypy with the following check fails on micronumpy,
- # XXX investigate
- #resbox = executor.execute(self.metainterp.cpu, self.metainterp,
- # rop.GETFIELD_GC, fielddescr, box)
- #assert resbox.constbox().same_constant(tobox.constbox())
+ resbox = executor.execute(self.metainterp.cpu, self.metainterp,
+ rop.GETFIELD_GC, fielddescr, box)
+ assert resbox.constbox().same_constant(tobox.constbox())
return tobox
resbox = self.execute_with_descr(opnum, fielddescr, box)
self.metainterp.heapcache.getfield_now_known(box, fielddescr, resbox)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
