From 182aea2f57002dcea39dfdfe3faf642d724dd80b Mon Sep 17 00:00:00 2001 From: Ken Jin Date: Mon, 16 Mar 2026 21:52:56 +0800 Subject: [PATCH] gh-146018: Disable over-aggressive optimization for _GUARD_CODE_VERSION (GH-145923) --- Python/optimizer_bytecodes.c | 4 +++- Python/optimizer_cases.c.h | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Python/optimizer_bytecodes.c b/Python/optimizer_bytecodes.c index e0410be55652..f3a391b2e37e 100644 --- a/Python/optimizer_bytecodes.c +++ b/Python/optimizer_bytecodes.c @@ -1761,7 +1761,9 @@ dummy_func(void) { PyCodeObject *co = get_current_code_object(ctx); if (co->co_version == version) { _Py_BloomFilter_Add(dependencies, co); - REPLACE_OP(this_instr, _NOP, 0, 0); + // TODO gh-144651: + // If we've previously guarded on this code version in a trace, we + // can avoid guarding it again. } else { ctx->done = true; diff --git a/Python/optimizer_cases.c.h b/Python/optimizer_cases.c.h index 7e5b26c6d725..942a730e4fac 100644 --- a/Python/optimizer_cases.c.h +++ b/Python/optimizer_cases.c.h @@ -4290,7 +4290,6 @@ PyCodeObject *co = get_current_code_object(ctx); if (co->co_version == version) { _Py_BloomFilter_Add(dependencies, co); - REPLACE_OP(this_instr, _NOP, 0, 0); } else { ctx->done = true; -- 2.47.3