Author: Carl Friedrich Bolz <[email protected]>
Branch: regalloc-playground
Changeset: r92191:d88eaeb16464
Date: 2017-08-20 16:31 +0200
http://bitbucket.org/pypy/pypy/changeset/d88eaeb16464/
Log: merge default
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
@@ -518,7 +518,7 @@
clt.frame_info = rffi.cast(jitframe.JITFRAMEINFOPTR, frame_info)
clt.frame_info.clear() # for now
- if log:
+ if log or self._debug:
number = looptoken.number
operations = self._inject_debugging_code(looptoken, operations,
'e', number)
@@ -622,7 +622,7 @@
faildescr.adr_jump_offset)
self.mc.force_frame_size(DEFAULT_FRAME_BYTES)
descr_number = compute_unique_id(faildescr)
- if log:
+ if log or self._debug:
operations = self._inject_debugging_code(faildescr, operations,
'b', descr_number)
arglocs = self.rebuild_faillocs_from_descr(faildescr, inputargs)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
