Author: Alex Gaynor <[email protected]>
Branch:
Changeset: r63523:db09ff648d53
Date: 2013-04-20 07:52 -0700
http://bitbucket.org/pypy/pypy/changeset/db09ff648d53/
Log: merged upstream
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
@@ -1320,6 +1320,7 @@
with saved_registers(self.mc, regs_to_save, vfp_regs_to_save):
self._emit_call(imm(self.reacqgil_addr), [], fcond,
can_collect=False)
+ self._reload_frame_if_necessary(self.mc)
def _store_force_index(self, guard_op):
faildescr = guard_op.getdescr()
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
