commit bf353f3c2d937772a8cf30b15fd8eb7b82665ccb
author Mark Shannon <mark@hotpy.org> Thu Dec 17 13:55:28 2020 +0000
committer GitHub <noreply@github.com> Thu Dec 17 13:55:28 2020 +0000
tree 9196732769c1cca2bd01a44e668fe4c5fb29f7d7
parent 40125ab3252453bf205ed906e46bf9741c27bf9d

bpo-42246: Make sure that `f_lasti`, and thus `f_lineno`, is set correctly after raising or reraising an exception (GH-23803)

* Ensure that f_lasti is set correctly after an exception is raised to conform to PEP 626.

* Update importlib

* Add NEWS.

Python/opcode_targets.h

diff --git a/Python/opcode_targets.h b/Python/opcode_targets.h
index 538fdbe..8495871 100644
--- a/Python/opcode_targets.h
+++ b/Python/opcode_targets.h
@@ -47,7 +47,7 @@
     &&_unknown_opcode,
     &&_unknown_opcode,
     &&_unknown_opcode,
-    &&TARGET_RERAISE,
+    &&_unknown_opcode,
     &&TARGET_WITH_EXCEPT_START,
     &&TARGET_GET_AITER,
     &&TARGET_GET_ANEXT,
@@ -118,7 +118,7 @@
     &&TARGET_LOAD_GLOBAL,
     &&TARGET_IS_OP,
     &&TARGET_CONTAINS_OP,
-    &&_unknown_opcode,
+    &&TARGET_RERAISE,
     &&_unknown_opcode,
     &&TARGET_JUMP_IF_NOT_EXC_MATCH,
     &&TARGET_SETUP_FINALLY,