Author: Armin Rigo <[email protected]>
Branch:
Changeset: r80878:8aadecc01b7d
Date: 2015-11-24 09:11 +0000
http://bitbucket.org/pypy/pypy/changeset/8aadecc01b7d/
Log: issue #2185: shooting in the dark
diff --git a/rpython/jit/metainterp/optimizeopt/unroll.py
b/rpython/jit/metainterp/optimizeopt/unroll.py
--- a/rpython/jit/metainterp/optimizeopt/unroll.py
+++ b/rpython/jit/metainterp/optimizeopt/unroll.py
@@ -314,9 +314,16 @@
args, virtuals = target_virtual_state.make_inputargs_and_virtuals(
args, self.optimizer)
short_preamble = target_token.short_preamble
- extra = self.inline_short_preamble(args + virtuals, args,
- short_preamble, self.optimizer.patchguardop,
- target_token, label_op)
+ try:
+ extra = self.inline_short_preamble(args + virtuals, args,
+ short_preamble,
self.optimizer.patchguardop,
+ target_token, label_op)
+ except KeyError:
+ # SHOULD NOT OCCUR BUT DOES: WHY?? issue #2185
+ self.optimizer.metainterp_sd.logger_ops.log_short_preamble([],
+ short_preamble, {})
+ raise
+
self.send_extra_operation(jump_op.copy_and_change(rop.JUMP,
args=args + extra,
descr=target_token))
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
