[pypy-commit] pypy default: Untested: same as 4c7864396507

arigo pypy.commits at gmail.com
Sun Mar 5 15:39:46 EST 2017


Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r90574:9c0fa68bb404
Date: 2017-03-05 21:39 +0100
http://bitbucket.org/pypy/pypy/changeset/9c0fa68bb404/

Log:	Untested: same as 4c7864396507

diff --git a/rpython/jit/backend/ppc/opassembler.py b/rpython/jit/backend/ppc/opassembler.py
--- a/rpython/jit/backend/ppc/opassembler.py
+++ b/rpython/jit/backend/ppc/opassembler.py
@@ -666,7 +666,7 @@
         jmp_adr = self.mc.get_relative_pos()
         self.mc.trap()        # patched later to a 'bc'
 
-        self.load_gcmap(self.mc, r.r2, regalloc.get_gcmap())
+        self.load_gcmap(self.mc, r.r2, regalloc.get_gcmap([resloc]))
 
         # save away r3, r4, r5, r6, r12 into the jitframe
         should_be_saved = [
diff --git a/rpython/jit/backend/zarch/opassembler.py b/rpython/jit/backend/zarch/opassembler.py
--- a/rpython/jit/backend/zarch/opassembler.py
+++ b/rpython/jit/backend/zarch/opassembler.py
@@ -390,7 +390,7 @@
                 if reg in self._COND_CALL_SAVE_REGS]
         self._push_core_regs_to_jitframe(self.mc, should_be_saved)
 
-        self.push_gcmap(self.mc, regalloc.get_gcmap())
+        self.push_gcmap(self.mc, regalloc.get_gcmap([resloc]))
         #
         # load the 0-to-4 arguments into these registers, with the address of
         # the function to call into r11


More information about the pypy-commit mailing list