Author: Armin Rigo <ar...@tunes.org>
Branch: optresult
Changeset: r79168:fda6dfca8877
Date: 2015-08-23 20:33 +0200
http://bitbucket.org/pypy/pypy/changeset/fda6dfca8877/
Log: Fix the merge
diff --git a/rpython/jit/backend/llsupport/rewrite.py
b/rpython/jit/backend/llsupport/rewrite.py
--- a/rpython/jit/backend/llsupport/rewrite.py
+++ b/rpython/jit/backend/llsupport/rewrite.py
@@ -121,7 +121,8 @@
if op.getopnum() == rop.DEBUG_MERGE_POINT:
continue
# ---------- GETFIELD_GC ----------
- if op.getopnum() == rop.GETFIELD_GC:
+ if op.getopnum() in (rop.GETFIELD_GC_I, rop.GETFIELD_GC_F,
+ rop.GETFIELD_GC_R):
self.handle_getfield_gc(op)
continue
# ---------- turn NEWxxx into CALL_MALLOC_xxx ----------
@@ -194,7 +195,7 @@
followed by a bunch of 'setfields', and the 'pending_zeros'
optimization we do here is meant for this case."""
self.emit_pending_zeros()
- self.newops.append(op)
+ self.emit_op(op)
# ----------
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
