mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

[3.12] gh-109889: comment out assertion indicating a failed optimization of a redundant NOP (#109899)

Browse source 
* [3.12] gh-109889: comment out assertion indicating a failed optimization of a redundant NOP

* comment out the function to avoid warnings on it being unused
This commit is contained in:
Irit Katriel 2023-09-26 16:17:32 +01:00 • committed by GitHub
parent 57ff216215
commit 648198c37f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Python/flowgraph.c
View file

@ -366,6 +366,7 @@ _PyCfgBuilder_Addop(cfg_builder *g, int opcode, int oparg, location loc)
#ifndef NDEBUG #ifndef NDEBUG
static int remove_redundant_nops(basicblock *bb); static int remove_redundant_nops(basicblock *bb);
/*
static bool static bool
no_redundant_nops(cfg_builder *g) { no_redundant_nops(cfg_builder *g) {
for (basicblock *b = g->g_entryblock; b != NULL; b = b->b_next) { for (basicblock *b = g->g_entryblock; b != NULL; b = b->b_next) {
@ -375,6 +376,7 @@ no_redundant_nops(cfg_builder *g) {
} }
return true; return true;
} }
*/
static bool static bool
no_empty_basic_blocks(cfg_builder *g) { no_empty_basic_blocks(cfg_builder *g) {
@ -1595,7 +1597,11 @@ optimize_cfg(cfg_builder *g, PyObject *consts, PyObject *const_cache)
remove_redundant_nops(b); remove_redundant_nops(b);
} }
eliminate_empty_basic_blocks(g); eliminate_empty_basic_blocks(g);
assert(no_redundant_nops(g)); /* This assertion fails in an edge case (See gh-109889).
* Remove it for the release (it's just one more NOP in the
* bytecode for unlikely code).
*/
// assert(no_redundant_nops(g));
RETURN_IF_ERROR(remove_redundant_jumps(g)); RETURN_IF_ERROR(remove_redundant_jumps(g));
return SUCCESS; return SUCCESS;
} }