Merge branch 'main' of https://github.com/python/cpython into dis_qui…

…ckened_code
python · markshannon · Apr 19, 2022 · Mar 23, 2022 · Mar 24, 2022 · Mar 24, 2022
commit 88ab80c5b509c33f286342080dd485693ae4c0cf
diff --git a/Lib/dis.py b/Lib/dis.py
@@ -456,7 +456,8 @@ def _get_instructions_bytes(code, varname_from_oparg=None,
                 argval = arg*2
                 argrepr = "to " + repr(argval)
             elif deop in hasjrel:
-                argval = offset + 2 + arg*2
+                signed_arg = -arg if deop == JUMP_BACKWARD else arg
+                argval = offset + 2 + signed_arg*2
                 argrepr = "to " + repr(argval)
             elif deop in haslocal or deop in hasfree:
                 argval, argrepr = _get_name_info(arg, varname_from_oparg)

diff --git a/Lib/test/test_dis.py b/Lib/test/test_dis.py
@@ -683,7 +683,7 @@ def test_boundaries(self):
 
     def test_widths(self):
         for opcode, opname in enumerate(dis.opname):
-            if opname in dis.deoptmap or opname == "JUMP_IF_NOT_EXC_MATCH":
+            if opname in dis.deoptmap:
                 continue
             with self.subTest(opname=opname):
                 width = dis._OPNAME_WIDTH