Author: Armin Rigo <ar...@tunes.org>
Branch: conditional_call_value_3
Changeset: r87032:1d8aa0d6ff47
Date: 2016-09-12 11:27 +0100
http://bitbucket.org/pypy/pypy/changeset/1d8aa0d6ff47/
Log: merge heads
diff --git a/rpython/jit/backend/x86/regalloc.py
b/rpython/jit/backend/x86/regalloc.py
--- a/rpython/jit/backend/x86/regalloc.py
+++ b/rpython/jit/backend/x86/regalloc.py
@@ -961,7 +961,8 @@
assert not isinstance(condvalue_loc, ImmedLoc)
self.assembler.test_location(condvalue_loc)
self.assembler.guard_success_cc = rx86.Conditions['Z']
- resloc = self.rm.force_result_in_reg(op, args[0])
+ resloc = self.rm.force_result_in_reg(op, args[0],
+ forbidden_vars=arglocs)
self.assembler.cond_call(op, gcmap, imm_func, arglocs, resloc)
consider_cond_call_value_i = consider_cond_call
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
