[pypy-commit] pypy copystrcontents-in-rewrite: Fix for arm

arigo pypy.commits at gmail.com
Sun Jun 9 07:31:19 EDT 2019


Author: Armin Rigo <arigo at tunes.org>
Branch: copystrcontents-in-rewrite
Changeset: r96781:101b83933f94
Date: 2019-06-09 13:30 +0200
http://bitbucket.org/pypy/pypy/changeset/101b83933f94/

Log:	Fix for arm

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
@@ -837,6 +837,7 @@
     def emit_op_load_effective_address(self, op, arglocs, regalloc, fcond):
         self._gen_address(arglocs[4], arglocs[0], arglocs[1], arglocs[3].value,
                           arglocs[2].value)
+        return fcond
 
    # result = base_loc  + (scaled_loc << scale) + static_offset
     def _gen_address(self, result, base_loc, scaled_loc, scale=0, static_offset=0):


More information about the pypy-commit mailing list