Author: Armin Rigo <ar...@tunes.org>
Branch: guard-compatible
Changeset: r94074:40ed7f642faf
Date: 2018-03-22 15:29 +0100
http://bitbucket.org/pypy/pypy/changeset/40ed7f642faf/
Log: fixes
diff --git a/rpython/jit/backend/x86/assembler.py
b/rpython/jit/backend/x86/assembler.py
--- a/rpython/jit/backend/x86/assembler.py
+++ b/rpython/jit/backend/x86/assembler.py
@@ -917,11 +917,12 @@
return rawstart
def materialize_loop(self, looptoken):
+ """Must be followed by materialize_done() later"""
self.datablockwrapper.done() # finish using cpu.asmmemmgr
self.datablockwrapper = None
allblocks = self.get_asmmemmgr_blocks(looptoken)
size = self.mc.get_relative_pos()
- res = self.materialize(self.mc, allblocks,
+ res = self.mc.materialize(self.cpu, allblocks,
gcrootmap=self.cpu.gc_ll_descr.gcrootmap)
if self.cpu.HAS_CODEMAP:
self.cpu.codemap.register_codemap(
diff --git a/rpython/jit/backend/x86/guard_compat.py
b/rpython/jit/backend/x86/guard_compat.py
--- a/rpython/jit/backend/x86/guard_compat.py
+++ b/rpython/jit/backend/x86/guard_compat.py
@@ -288,7 +288,8 @@
mc.JMP_s(0)
assembler.flush_pending_slowpaths(mc)
- assembler.guard_compat_search_tree = assembler.materialize(mc, [])
+ assembler.guard_compat_search_tree = assembler.materialize(mc, [],
+ "guard_compat_search_tree")
def build_once_guard_compat_recovery(assembler):
@@ -303,7 +304,8 @@
target = assembler.get_target_for_failure_recovery_of_guard_compat()
mc.JMP(regloc.imm(target))
- assembler.guard_compat_recovery = assembler.materialize(mc, [])
+ assembler.guard_compat_recovery = assembler.materialize(mc, [],
+ "guard_compat_recovery")
def generate_recovery_stub(assembler, guard_token):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
