Author: Armin Rigo <ar...@tunes.org>
Branch:
Changeset: r73743:987a3cad8bfd
Date: 2014-09-29 10:26 +0200
http://bitbucket.org/pypy/pypy/changeset/987a3cad8bfd/
Log: Translation fix
diff --git a/rpython/jit/backend/arm/assembler.py
b/rpython/jit/backend/arm/assembler.py
--- a/rpython/jit/backend/arm/assembler.py
+++ b/rpython/jit/backend/arm/assembler.py
@@ -931,6 +931,7 @@
guard, fcond)
fcond = asm_operations_with_guard[opnum](self, op,
guard, arglocs, regalloc, fcond)
+ assert fcond is not None
regalloc.next_instruction()
regalloc.possibly_free_vars_for_op(guard)
regalloc.possibly_free_vars(guard.getfailargs())
@@ -941,6 +942,7 @@
if arglocs is not None:
fcond = asm_operations[opnum](self, op, arglocs,
regalloc, fcond)
+ assert fcond is not None
if op.is_guard():
regalloc.possibly_free_vars(op.getfailargs())
if op.result:
diff --git a/rpython/jit/backend/arm/opassembler.py
b/rpython/jit/backend/arm/opassembler.py
--- a/rpython/jit/backend/arm/opassembler.py
+++ b/rpython/jit/backend/arm/opassembler.py
@@ -1256,3 +1256,4 @@
[dstaddr_loc, imm(0), length_loc])
regalloc.rm.possibly_free_var(length_box)
regalloc.rm.possibly_free_var(dstaddr_box)
+ return fcond
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
