Author: Richard Plangger <[email protected]>
Branch:
Changeset: r85853:12db98eab76c
Date: 2016-07-25 13:24 +0200
http://bitbucket.org/pypy/pypy/changeset/12db98eab76c/
Log: provide faildescr to start_new_trace instead of addr to resumekey,
arm backend add missing import
diff --git a/rpython/jit/backend/arm/assembler.py
b/rpython/jit/backend/arm/assembler.py
--- a/rpython/jit/backend/arm/assembler.py
+++ b/rpython/jit/backend/arm/assembler.py
@@ -29,6 +29,7 @@
from rpython.rtyper.lltypesystem import lltype, rffi
from rpython.jit.backend.arm import callbuilder
from rpython.rtyper.lltypesystem.lloperation import llop
+from rpython.rlib.rjitlog import rjitlog as jl
class AssemblerARM(ResOpAssembler):
diff --git a/rpython/jit/metainterp/compile.py
b/rpython/jit/metainterp/compile.py
--- a/rpython/jit/metainterp/compile.py
+++ b/rpython/jit/metainterp/compile.py
@@ -253,7 +253,8 @@
trace = history.trace
warmstate = jitdriver_sd.warmstate
#
- metainterp_sd.jitlog.start_new_trace(metainterp_sd, None, False)
+ metainterp_sd.jitlog.start_new_trace(metainterp_sd,
+ faildescr=None, entry_bridge=False)
#
enable_opts = jitdriver_sd.warmstate.enable_opts
if try_disabling_unroll:
@@ -347,7 +348,9 @@
jitdriver_sd = metainterp.jitdriver_sd
history = metainterp.history
#
- metainterp_sd.jitlog.start_new_trace(metainterp_sd, resumekey, False)
+ faildescr = resumekey.guard_op.getdescr()
+ metainterp_sd.jitlog.start_new_trace(metainterp_sd,
+ faildescr=faildescr, entry_bridge=False)
#
loop_jitcell_token = metainterp.get_procedure_token(greenkey)
assert loop_jitcell_token
@@ -1049,7 +1052,9 @@
metainterp_sd = metainterp.staticdata
jitdriver_sd = metainterp.jitdriver_sd
#
- metainterp_sd.jitlog.start_new_trace(metainterp_sd, resumekey, False)
+ resumekey.guard_op.getdescr()
+ metainterp_sd.jitlog.start_new_trace(metainterp_sd,
+ faildescr=faildescr, entry_bridge=False)
#
if isinstance(resumekey, ResumeAtPositionDescr):
inline_short_preamble = False
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
