https://github.com/python/cpython/commit/74e6f4b32fceea8e8ffb0424d9bdc6589faf7ee4
commit: 74e6f4b32fceea8e8ffb0424d9bdc6589faf7ee4
branch: main
author: Irit Katriel <[email protected]>
committer: iritkatriel <[email protected]>
date: 2024-02-16T19:25:19Z
summary:
gh-112720: make it easier to subclass and modify dis.ArgResolver's jump arg
resolution (#115564)
files:
A Misc/NEWS.d/next/Library/2024-02-16-16-40-10.gh-issue-112720.io6_Ac.rst
M Lib/dis.py
M Lib/test/test_dis.py
diff --git a/Lib/dis.py b/Lib/dis.py
index f05ea1a24f45a7..d146bcbb5097ef 100644
--- a/Lib/dis.py
+++ b/Lib/dis.py
@@ -505,6 +505,20 @@ def __init__(self, co_consts=None, names=None,
varname_from_oparg=None, labels_m
self.varname_from_oparg = varname_from_oparg
self.labels_map = labels_map or {}
+ def offset_from_jump_arg(self, op, arg, offset):
+ deop = _deoptop(op)
+ if deop in hasjabs:
+ return arg * 2
+ elif deop in hasjrel:
+ signed_arg = -arg if _is_backward_jump(deop) else arg
+ argval = offset + 2 + signed_arg*2
+ caches = _get_cache_size(_all_opname[deop])
+ argval += 2 * caches
+ if deop == ENTER_EXECUTOR:
+ argval += 2
+ return argval
+ return None
+
def get_label_for_offset(self, offset):
return self.labels_map.get(offset, None)
@@ -536,17 +550,11 @@ def get_argval_argrepr(self, op, arg, offset):
argrepr = f"{argrepr} + NULL|self"
else:
argval, argrepr = _get_name_info(arg, get_name)
- elif deop in hasjabs:
- argval = arg*2
- argrepr = f"to L{self.labels_map[argval]}"
- elif deop in hasjrel:
- signed_arg = -arg if _is_backward_jump(deop) else arg
- argval = offset + 2 + signed_arg*2
- caches = _get_cache_size(_all_opname[deop])
- argval += 2 * caches
- if deop == ENTER_EXECUTOR:
- argval += 2
- argrepr = f"to L{self.labels_map[argval]}"
+ elif deop in hasjump or deop in hasexc:
+ argval = self.offset_from_jump_arg(op, arg, offset)
+ lbl = self.get_label_for_offset(argval)
+ assert lbl is not None
+ argrepr = f"to L{lbl}"
elif deop in (LOAD_FAST_LOAD_FAST, STORE_FAST_LOAD_FAST,
STORE_FAST_STORE_FAST):
arg1 = arg >> 4
arg2 = arg & 15
diff --git a/Lib/test/test_dis.py b/Lib/test/test_dis.py
index a5917da346dded..a93cb509b651c5 100644
--- a/Lib/test/test_dis.py
+++ b/Lib/test/test_dis.py
@@ -1986,6 +1986,22 @@ def f(opcode, oparg, offset, *init_args):
self.assertEqual(f(opcode.opmap["BINARY_OP"], 3, *args), (3, '<<'))
self.assertEqual(f(opcode.opmap["CALL_INTRINSIC_1"], 2, *args), (2,
'INTRINSIC_IMPORT_STAR'))
+ def test_custom_arg_resolver(self):
+ class MyArgResolver(dis.ArgResolver):
+ def offset_from_jump_arg(self, op, arg, offset):
+ return arg + 1
+
+ def get_label_for_offset(self, offset):
+ return 2 * offset
+
+ def f(opcode, oparg, offset, *init_args):
+ arg_resolver = MyArgResolver(*init_args)
+ return arg_resolver.get_argval_argrepr(opcode, oparg, offset)
+ offset = 42
+ self.assertEqual(f(opcode.opmap["JUMP_BACKWARD"], 1, offset), (2, 'to
L4'))
+ self.assertEqual(f(opcode.opmap["SETUP_FINALLY"], 2, offset), (3, 'to
L6'))
+
+
def get_instructions(self, code):
return dis._get_instructions_bytes(code)
diff --git
a/Misc/NEWS.d/next/Library/2024-02-16-16-40-10.gh-issue-112720.io6_Ac.rst
b/Misc/NEWS.d/next/Library/2024-02-16-16-40-10.gh-issue-112720.io6_Ac.rst
new file mode 100644
index 00000000000000..32916ede4dee35
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2024-02-16-16-40-10.gh-issue-112720.io6_Ac.rst
@@ -0,0 +1,2 @@
+Refactor :class:`dis.ArgResolver` to make it possible to subclass and change
+the way jump args are interpreted.
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
