move label_exception_targets to before cfg optimizations

iritkatriel · iritkatriel · commit d5ab8121e3de · 2022-09-13T22:48:59.000+01:00
diff --git a/Python/compile.c b/Python/compile.c
@@ -8635,6 +8635,9 @@ assemble(struct compiler *c, int addNone)
     if (mark_except_handlers(g->g_entryblock) < 0) {
         goto error;
     }
+    if (label_exception_targets(g->g_entryblock)) {
+        goto error;
+    }
     if (optimize_cfg(g, consts, c->c_const_cache)) {
         goto error;
     }
@@ -8653,9 +8656,6 @@ assemble(struct compiler *c, int addNone)
     }
     /* TO DO -- For 3.12, make sure that `maxdepth <= MAX_ALLOWED_STACK_USE` */
 
-    if (label_exception_targets(g->g_entryblock)) {
-        goto error;
-    }
     convert_exception_handlers_to_nops(g->g_entryblock);
 
     if (push_cold_blocks_to_end(g, code_flags) < 0) {

Original file line number	Diff line number	Diff line change
`@@ -8635,6 +8635,9 @@ assemble(struct compiler *c, int addNone)`
`8635`	`8635`	`if (mark_except_handlers(g->g_entryblock) < 0) {`
`8636`	`8636`	`goto error;`
`8637`	`8637`	`}`
	`8638`	`+ if (label_exception_targets(g->g_entryblock)) {`
	`8639`	`+ goto error;`
	`8640`	`+ }`
`8638`	`8641`	`if (optimize_cfg(g, consts, c->c_const_cache)) {`
`8639`	`8642`	`goto error;`
`8640`	`8643`	`}`
`@@ -8653,9 +8656,6 @@ assemble(struct compiler *c, int addNone)`
`8653`	`8656`	`}`
`8654`	`8657`	/* TO DO -- For 3.12, make sure that `maxdepth <= MAX_ALLOWED_STACK_USE` */
`8655`	`8658`
`8656`		`- if (label_exception_targets(g->g_entryblock)) {`
`8657`		`- goto error;`
`8658`		`- }`
`8659`	`8659`	`convert_exception_handlers_to_nops(g->g_entryblock);`
`8660`	`8660`
`8661`	`8661`	`if (push_cold_blocks_to_end(g, code_flags) < 0) {`