From e3987b0d43205f76387cb88137283ec4133ff8ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A9n=C3=A9dikt=20Tran?= <10796600+picnixz@users.noreply.github.com> Date: Sun, 16 Mar 2025 18:41:52 +0100 Subject: [PATCH 1/2] rename `not` field to `not_` for C++ extension modules --- Include/internal/pycore_optimizer.h | 2 +- Python/optimizer_symbols.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Include/internal/pycore_optimizer.h b/Include/internal/pycore_optimizer.h index 79861167f65e63..43cfdf76a46810 100644 --- a/Include/internal/pycore_optimizer.h +++ b/Include/internal/pycore_optimizer.h @@ -201,7 +201,7 @@ typedef struct _jit_opt_tuple { typedef struct { uint8_t tag; - bool not; + bool not_; uint16_t value; } JitOptTruthiness; diff --git a/Python/optimizer_symbols.c b/Python/optimizer_symbols.c index 5adc1c8a62ce8b..1cb425026bd75b 100644 --- a/Python/optimizer_symbols.c +++ b/Python/optimizer_symbols.c @@ -113,7 +113,7 @@ _Py_uop_sym_is_const(JitOptContext *ctx, JitOptSymbol *sym) if (truthiness < 0) { return false; } - make_const(sym, (truthiness ^ sym->truthiness.not) ? Py_True : Py_False); + make_const(sym, (truthiness ^ sym->truthiness.not_) ? Py_True : Py_False); return true; } return false; @@ -138,7 +138,7 @@ _Py_uop_sym_get_const(JitOptContext *ctx, JitOptSymbol *sym) if (truthiness < 0) { return NULL; } - PyObject *res = (truthiness ^ sym->truthiness.not) ? Py_True : Py_False; + PyObject *res = (truthiness ^ sym->truthiness.not_) ? Py_True : Py_False; make_const(sym, res); return res; } @@ -289,7 +289,7 @@ _Py_uop_sym_set_const(JitOptContext *ctx, JitOptSymbol *sym, PyObject *const_val } JitOptSymbol *value = allocation_base(ctx) + sym->truthiness.value; PyTypeObject *type = _Py_uop_sym_get_type(value); - if (const_val == (sym->truthiness.not ? Py_False : Py_True)) { + if (const_val == (sym->truthiness.not_ ? Py_False : Py_True)) { // value is truthy. This is only useful for bool: if (type == &PyBool_Type) { _Py_uop_sym_set_const(ctx, value, Py_True); @@ -496,7 +496,7 @@ _Py_uop_sym_truthiness(JitOptContext *ctx, JitOptSymbol *sym) if (truthiness < 0) { return truthiness; } - truthiness ^= sym->truthiness.not; + truthiness ^= sym->truthiness.not_; make_const(sym, truthiness ? Py_True : Py_False); return truthiness; } @@ -590,8 +590,8 @@ JitOptSymbol * _Py_uop_sym_new_truthiness(JitOptContext *ctx, JitOptSymbol *value, bool truthy) { // It's clearer to invert this in the signature: - bool not = !truthy; - if (value->tag == JIT_SYM_TRUTHINESS_TAG && value->truthiness.not == not) { + bool not_ = !truthy; + if (value->tag == JIT_SYM_TRUTHINESS_TAG && value->truthiness.not_ == not_) { return value; } JitOptSymbol *res = sym_new(ctx); @@ -601,11 +601,11 @@ _Py_uop_sym_new_truthiness(JitOptContext *ctx, JitOptSymbol *value, bool truthy) int truthiness = _Py_uop_sym_truthiness(ctx, value); if (truthiness < 0) { res->tag = JIT_SYM_TRUTHINESS_TAG; - res->truthiness.not = not; + res->truthiness.not_ = not_; res->truthiness.value = (uint16_t)(value - allocation_base(ctx)); } else { - make_const(res, (truthiness ^ not) ? Py_True : Py_False); + make_const(res, (truthiness ^ not_) ? Py_True : Py_False); } return res; } From 2a1f4e44ed756b934662ea543b9038ebe0893d43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A9n=C3=A9dikt=20Tran?= <10796600+picnixz@users.noreply.github.com> Date: Wed, 19 Mar 2025 01:50:09 +0100 Subject: [PATCH 2/2] rename `not_` to `invert` instead --- Include/internal/pycore_optimizer.h | 2 +- Python/optimizer_symbols.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Include/internal/pycore_optimizer.h b/Include/internal/pycore_optimizer.h index 43cfdf76a46810..d72139935cdee0 100644 --- a/Include/internal/pycore_optimizer.h +++ b/Include/internal/pycore_optimizer.h @@ -201,7 +201,7 @@ typedef struct _jit_opt_tuple { typedef struct { uint8_t tag; - bool not_; + bool invert; uint16_t value; } JitOptTruthiness; diff --git a/Python/optimizer_symbols.c b/Python/optimizer_symbols.c index 1cb425026bd75b..3b72d1ab9bb454 100644 --- a/Python/optimizer_symbols.c +++ b/Python/optimizer_symbols.c @@ -113,7 +113,7 @@ _Py_uop_sym_is_const(JitOptContext *ctx, JitOptSymbol *sym) if (truthiness < 0) { return false; } - make_const(sym, (truthiness ^ sym->truthiness.not_) ? Py_True : Py_False); + make_const(sym, (truthiness ^ sym->truthiness.invert) ? Py_True : Py_False); return true; } return false; @@ -138,7 +138,7 @@ _Py_uop_sym_get_const(JitOptContext *ctx, JitOptSymbol *sym) if (truthiness < 0) { return NULL; } - PyObject *res = (truthiness ^ sym->truthiness.not_) ? Py_True : Py_False; + PyObject *res = (truthiness ^ sym->truthiness.invert) ? Py_True : Py_False; make_const(sym, res); return res; } @@ -289,7 +289,7 @@ _Py_uop_sym_set_const(JitOptContext *ctx, JitOptSymbol *sym, PyObject *const_val } JitOptSymbol *value = allocation_base(ctx) + sym->truthiness.value; PyTypeObject *type = _Py_uop_sym_get_type(value); - if (const_val == (sym->truthiness.not_ ? Py_False : Py_True)) { + if (const_val == (sym->truthiness.invert ? Py_False : Py_True)) { // value is truthy. This is only useful for bool: if (type == &PyBool_Type) { _Py_uop_sym_set_const(ctx, value, Py_True); @@ -496,7 +496,7 @@ _Py_uop_sym_truthiness(JitOptContext *ctx, JitOptSymbol *sym) if (truthiness < 0) { return truthiness; } - truthiness ^= sym->truthiness.not_; + truthiness ^= sym->truthiness.invert; make_const(sym, truthiness ? Py_True : Py_False); return truthiness; } @@ -590,8 +590,8 @@ JitOptSymbol * _Py_uop_sym_new_truthiness(JitOptContext *ctx, JitOptSymbol *value, bool truthy) { // It's clearer to invert this in the signature: - bool not_ = !truthy; - if (value->tag == JIT_SYM_TRUTHINESS_TAG && value->truthiness.not_ == not_) { + bool invert = !truthy; + if (value->tag == JIT_SYM_TRUTHINESS_TAG && value->truthiness.invert == invert) { return value; } JitOptSymbol *res = sym_new(ctx); @@ -601,11 +601,11 @@ _Py_uop_sym_new_truthiness(JitOptContext *ctx, JitOptSymbol *value, bool truthy) int truthiness = _Py_uop_sym_truthiness(ctx, value); if (truthiness < 0) { res->tag = JIT_SYM_TRUTHINESS_TAG; - res->truthiness.not_ = not_; + res->truthiness.invert = invert; res->truthiness.value = (uint16_t)(value - allocation_base(ctx)); } else { - make_const(res, (truthiness ^ not_) ? Py_True : Py_False); + make_const(res, (truthiness ^ invert) ? Py_True : Py_False); } return res; }