Author: David Schneider <david.schnei...@picle.org>
Branch:
Changeset: r58950:015887981ee0
Date: 2012-11-16 16:47 +0100
http://bitbucket.org/pypy/pypy/changeset/015887981ee0/
Log: merge heads
diff --git a/pypy/jit/metainterp/heapcache.py b/pypy/jit/metainterp/heapcache.py
--- a/pypy/jit/metainterp/heapcache.py
+++ b/pypy/jit/metainterp/heapcache.py
@@ -74,7 +74,9 @@
elif (opnum != rop.GETFIELD_GC and
opnum != rop.MARK_OPAQUE_PTR and
opnum != rop.PTR_EQ and
- opnum != rop.PTR_NE):
+ opnum != rop.PTR_NE and
+ opnum != rop.INSTANCE_PTR_EQ and
+ opnum != rop.INSTANCE_PTR_NE):
idx = 0
for box in argboxes:
# setarrayitem_gc don't escape its first argument
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
