Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-02-07 02:10:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge c66edf4c3a into b6d8aa436b

Browse source
This commit is contained in:
Mikhail Efimov 2026-02-05 06:37:12 +02:00 • committed by GitHub
commit 9efe90ae09
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 34 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

37
Objects/codeobject.c
View file

@ -2115,10 +2115,6 @@ code_returns_only_none(PyCodeObject *co)
int len = (int)Py_SIZE(co);
assert(len > 0);
// The last instruction either returns or raises. We can take advantage
// of that for a quick exit.
_Py_CODEUNIT final = _Py_GetBaseCodeUnit(co, len-1);
// Look up None in co_consts.
Py_ssize_t nconsts = PyTuple_Size(co->co_consts);
int none_index = 0;
@ -2131,29 +2127,24 @@ code_returns_only_none(PyCodeObject *co)
// None wasn't there, which means there was no implicit return,
// "return", or "return None".
// That means there must be
// an explicit return (non-None), or it only raises.
// The last instruction of a function often equals to "return X".
// We can take advantage of that for a quick exit.
_Py_CODEUNIT final = _Py_GetBaseCodeUnit(co, len-1);
if (IS_RETURN_OPCODE(final.op.code)) {
// It was an explicit return (non-None).
return 0;
}
// It must end with a raise then. We still have to walk the
// bytecode to see if there's any explicit return (non-None).
assert(IS_RAISE_OPCODE(final.op.code));
for (int i = 0; i < len; i += _PyInstruction_GetLength(co, i)) {
_Py_CODEUNIT inst = _Py_GetBaseCodeUnit(co, i);
if (IS_RETURN_OPCODE(inst.op.code)) {
// We alraedy know it isn't returning None.
return 0;
}
}
// It must only raise.
// We still have to find the RETURN_VALUE opcode,
// but there is no need to check the return value.
none_index = -1;
}
else {
// Walk the bytecode, looking for RETURN_VALUE.
for (int i = 0; i < len; i += _PyInstruction_GetLength(co, i)) {
_Py_CODEUNIT inst = _Py_GetBaseCodeUnit(co, i);
if (IS_RETURN_OPCODE(inst.op.code)) {
// Walk the bytecode, looking for RETURN_VALUE.
for (int i = 0; i < len; i += _PyInstruction_GetLength(co, i)) {
_Py_CODEUNIT inst = _Py_GetBaseCodeUnit(co, i);
if (IS_RETURN_OPCODE(inst.op.code)) {
if (none_index >= 0) {
assert(i != 0);
// Ignore it if it returns None.
_Py_CODEUNIT prev = _Py_GetBaseCodeUnit(co, i-1);
@ -2163,8 +2154,8 @@ code_returns_only_none(PyCodeObject *co)
continue;
}
}
return 0;
}
return 0;
}
}
return 1;