diff options
| author | Guido van Rossum <guido@python.org> | 2023-11-18 04:58:13 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-18 04:58:13 (GMT) |
| commit | eb3c94ea669561a0dfacaca715d4b2723bb2c6f4 (patch) | |
| tree | 241fe49c2c0ae402ed709674e63c16ad0ec24f8e /Python | |
| parent | 43b1c33204d125e256f7a0c3086ba547b71a105e (diff) | |
| download | cpython-eb3c94ea669561a0dfacaca715d4b2723bb2c6f4.zip cpython-eb3c94ea669561a0dfacaca715d4b2723bb2c6f4.tar.gz cpython-eb3c94ea669561a0dfacaca715d4b2723bb2c6f4.tar.bz2 | |
gh-110319: Assert type_version != 0 before using it (#112226)
- Ensure that `assert(type_version != 0);` always comes *before* using `type_version`
Also:
- In cases_generator, rename `-v` to from `--verbose` to `--viable`
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/bytecodes.c | 4 | ||||
| -rw-r--r-- | Python/generated_cases.c.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Python/bytecodes.c b/Python/bytecodes.c index bd81dc1..da98630 100644 --- a/Python/bytecodes.c +++ b/Python/bytecodes.c @@ -2026,8 +2026,8 @@ dummy_func( DEOPT_IF(tstate->interp->eval_frame); PyTypeObject *cls = Py_TYPE(owner); - DEOPT_IF(cls->tp_version_tag != type_version); assert(type_version != 0); + DEOPT_IF(cls->tp_version_tag != type_version); assert(Py_IS_TYPE(fget, &PyFunction_Type)); PyFunctionObject *f = (PyFunctionObject *)fget; assert(func_version != 0); @@ -2049,8 +2049,8 @@ dummy_func( assert((oparg & 1) == 0); DEOPT_IF(tstate->interp->eval_frame); PyTypeObject *cls = Py_TYPE(owner); - DEOPT_IF(cls->tp_version_tag != type_version); assert(type_version != 0); + DEOPT_IF(cls->tp_version_tag != type_version); assert(Py_IS_TYPE(getattribute, &PyFunction_Type)); PyFunctionObject *f = (PyFunctionObject *)getattribute; assert(func_version != 0); diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h index a74529d..3b4cc75 100644 --- a/Python/generated_cases.c.h +++ b/Python/generated_cases.c.h @@ -2933,8 +2933,8 @@ DEOPT_IF(tstate->interp->eval_frame, LOAD_ATTR); PyTypeObject *cls = Py_TYPE(owner); - DEOPT_IF(cls->tp_version_tag != type_version, LOAD_ATTR); assert(type_version != 0); + DEOPT_IF(cls->tp_version_tag != type_version, LOAD_ATTR); assert(Py_IS_TYPE(fget, &PyFunction_Type)); PyFunctionObject *f = (PyFunctionObject *)fget; assert(func_version != 0); @@ -2964,8 +2964,8 @@ assert((oparg & 1) == 0); DEOPT_IF(tstate->interp->eval_frame, LOAD_ATTR); PyTypeObject *cls = Py_TYPE(owner); - DEOPT_IF(cls->tp_version_tag != type_version, LOAD_ATTR); assert(type_version != 0); + DEOPT_IF(cls->tp_version_tag != type_version, LOAD_ATTR); assert(Py_IS_TYPE(getattribute, &PyFunction_Type)); PyFunctionObject *f = (PyFunctionObject *)getattribute; assert(func_version != 0); |