From: Irit Katriel <1055913+iritkatriel@users.noreply.github.com>
Date: Thu, 6 Jan 2022 19:43:16 +0000 (+0000)
Subject: bpo-46286: use the new POP_JUMP_IF_NOT_NONE opcode to simplify except* (GH-30439)
X-Git-Tag: v3.11.0a4~65
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=16dfabf75cd0786781bcd8ded6a12591fb893d68;p=thirdparty%2FPython%2Fcpython.git

bpo-46286: use the new POP_JUMP_IF_NOT_NONE opcode to simplify except* (GH-30439)



Automerge-Triggered-By: GH:iritkatriel
---

diff --git a/Python/compile.c b/Python/compile.c
index 62f37ca45263..643a5e507712 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -3515,9 +3515,7 @@ compiler_try_except(struct compiler *c, stmt_ty s)
 
    [orig, res]                                PREP_RERAISE_STAR
    [exc]                                      DUP_TOP
-   [exc, exc]                                 LOAD_CONST            None
-   [exc, exc, None]                           COMPARE_IS
-   [exc, is_none]                             POP_JUMP_IF_FALSE     RER
+   [exc, exc]                                 POP_JUMP_IF_NOT_NONE  RER
    [exc]                                      POP_TOP
    []                                         JUMP_FORWARD          L0
 
@@ -3687,9 +3685,7 @@ compiler_try_star_except(struct compiler *c, stmt_ty s)
     compiler_use_next_block(c, reraise_star);
     ADDOP(c, PREP_RERAISE_STAR);
     ADDOP(c, DUP_TOP);
-    ADDOP_LOAD_CONST(c, Py_None);
-    ADDOP_COMPARE(c, Is);
-    ADDOP_JUMP(c, POP_JUMP_IF_FALSE, reraise);
+    ADDOP_JUMP(c, POP_JUMP_IF_NOT_NONE, reraise);
     NEXT_BLOCK(c);
 
     /* Nothing to reraise */