move mark_except_handler to before cfg optimizations

iritkatriel · iritkatriel · commit dd2b3f367bdc · 2022-09-13T22:01:18.000+01:00
diff --git a/Python/compile.c b/Python/compile.c
@@ -8632,6 +8632,9 @@ assemble(struct compiler *c, int addNone)
     if (calculate_jump_targets(g->g_entryblock)) {
         goto error;
     }
+    if (mark_except_handlers(g->g_entryblock) < 0) {
+        goto error;
+    }
     if (optimize_cfg(g, consts, c->c_const_cache)) {
         goto error;
     }
@@ -9521,9 +9524,6 @@ optimize_cfg(cfg_builder *g, PyObject *consts, PyObject *const_cache)
             return -1;
         }
     }
-    if (mark_except_handlers(g->g_entryblock) < 0) {
-        return -1;
-    }
     if (mark_reachable(g->g_entryblock)) {
         return -1;
     }

Original file line number	Diff line number	Diff line change
`@@ -8632,6 +8632,9 @@ assemble(struct compiler *c, int addNone)`
`8632`	`8632`	`if (calculate_jump_targets(g->g_entryblock)) {`
`8633`	`8633`	`goto error;`
`8634`	`8634`	`}`
	`8635`	`+ if (mark_except_handlers(g->g_entryblock) < 0) {`
	`8636`	`+ goto error;`
	`8637`	`+ }`
`8635`	`8638`	`if (optimize_cfg(g, consts, c->c_const_cache)) {`
`8636`	`8639`	`goto error;`
`8637`	`8640`	`}`
`@@ -9521,9 +9524,6 @@ optimize_cfg(cfg_builder g, PyObject consts, PyObject *const_cache)`
`9521`	`9524`	`return -1;`
`9522`	`9525`	`}`
`9523`	`9526`	`}`
`9524`		`- if (mark_except_handlers(g->g_entryblock) < 0) {`
`9525`		`- return -1;`
`9526`		`- }`
`9527`	`9527`	`if (mark_reachable(g->g_entryblock)) {`
`9528`	`9528`	`return -1;`
`9529`	`9529`	`}`