mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-19 01:05:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

gh-114058: More robust method handling in redundancy eliminator (GH-115779)

Browse source
This commit is contained in:
Ken Jin 2024-02-23 15:42:03 +08:00 • committed by GitHub
parent a494a3dd8e
commit a33ffe4785
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 41 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Python/optimizer_analysis.c
View file

@ -315,6 +315,7 @@ sym_new_known_notnull(_Py_UOpsAbstractInterpContext *ctx)
if (res == NULL) {
return NULL;
}
sym_set_flag(res, KNOWN);
sym_set_flag(res, NOT_NULL);
return res;
}

21
Python/tier2_redundancy_eliminator_bytecodes.c
View file

@ -295,6 +295,27 @@ dummy_func(void) {
(void)owner;
}
op(_LOAD_ATTR_METHOD_WITH_VALUES, (descr/4, owner -- attr, self if (1))) {
OUT_OF_SPACE_IF_NULL(attr = sym_new_known_notnull(ctx));
OUT_OF_SPACE_IF_NULL(self = sym_new_known_notnull(ctx));
}
op(_LOAD_ATTR_METHOD_NO_DICT, (descr/4, owner -- attr, self if (1))) {
OUT_OF_SPACE_IF_NULL(attr = sym_new_known_notnull(ctx));
OUT_OF_SPACE_IF_NULL(self = sym_new_known_notnull(ctx));
}
op(_LOAD_ATTR_METHOD_LAZY_DICT, (descr/4, owner -- attr, self if (1))) {
OUT_OF_SPACE_IF_NULL(attr = sym_new_known_notnull(ctx));
OUT_OF_SPACE_IF_NULL(self = sym_new_known_notnull(ctx));
}
op(_INIT_CALL_BOUND_METHOD_EXACT_ARGS, (callable, unused, unused[oparg] -- func, self, unused[oparg])) {
OUT_OF_SPACE_IF_NULL(func = sym_new_known_notnull(ctx));
OUT_OF_SPACE_IF_NULL(self = sym_new_known_notnull(ctx));
}
op(_CHECK_FUNCTION_EXACT_ARGS, (func_version/2, callable, self_or_null, unused[oparg] -- callable, self_or_null, unused[oparg])) {
sym_set_type(callable, &PyFunction_Type);
(void)self_or_null;

35
Python/tier2_redundancy_eliminator_cases.c.h generated
View file

@ -1300,12 +1300,13 @@
}
case _LOAD_ATTR_METHOD_WITH_VALUES: {
_Py_UOpsSymType *owner;
_Py_UOpsSymType *attr;
_Py_UOpsSymType *self = NULL;
attr = sym_new_unknown(ctx);
if (attr == NULL) goto out_of_space;
self = sym_new_unknown(ctx);
if (self == NULL) goto out_of_space;
owner = stack_pointer[-1];
PyObject *descr = (PyObject *)this_instr->operand;
OUT_OF_SPACE_IF_NULL(attr = sym_new_known_notnull(ctx));
OUT_OF_SPACE_IF_NULL(self = sym_new_known_notnull(ctx));
stack_pointer[-1] = attr;
stack_pointer[0] = self;
stack_pointer += 1;
@ -1313,12 +1314,13 @@
}
case _LOAD_ATTR_METHOD_NO_DICT: {
_Py_UOpsSymType *owner;
_Py_UOpsSymType *attr;
_Py_UOpsSymType *self = NULL;
attr = sym_new_unknown(ctx);
if (attr == NULL) goto out_of_space;
self = sym_new_unknown(ctx);
if (self == NULL) goto out_of_space;
owner = stack_pointer[-1];
PyObject *descr = (PyObject *)this_instr->operand;
OUT_OF_SPACE_IF_NULL(attr = sym_new_known_notnull(ctx));
OUT_OF_SPACE_IF_NULL(self = sym_new_known_notnull(ctx));
stack_pointer[-1] = attr;
stack_pointer[0] = self;
stack_pointer += 1;
@ -1346,12 +1348,13 @@
}
case _LOAD_ATTR_METHOD_LAZY_DICT: {
_Py_UOpsSymType *owner;
_Py_UOpsSymType *attr;
_Py_UOpsSymType *self = NULL;
attr = sym_new_unknown(ctx);
if (attr == NULL) goto out_of_space;
self = sym_new_unknown(ctx);
if (self == NULL) goto out_of_space;
owner = stack_pointer[-1];
PyObject *descr = (PyObject *)this_instr->operand;
OUT_OF_SPACE_IF_NULL(attr = sym_new_known_notnull(ctx));
OUT_OF_SPACE_IF_NULL(self = sym_new_known_notnull(ctx));
stack_pointer[-1] = attr;
stack_pointer[0] = self;
stack_pointer += 1;
@ -1373,12 +1376,12 @@
}
case _INIT_CALL_BOUND_METHOD_EXACT_ARGS: {
_Py_UOpsSymType *callable;
_Py_UOpsSymType *func;
_Py_UOpsSymType *self;
func = sym_new_unknown(ctx);
if (func == NULL) goto out_of_space;
self = sym_new_unknown(ctx);
if (self == NULL) goto out_of_space;
callable = stack_pointer[-2 - oparg];
OUT_OF_SPACE_IF_NULL(func = sym_new_known_notnull(ctx));
OUT_OF_SPACE_IF_NULL(self = sym_new_known_notnull(ctx));
stack_pointer[-2 - oparg] = func;
stack_pointer[-1 - oparg] = self;
break;