mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-03 15:31:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

bpo-45107: Make LOAD_METHOD_CLASS safer and faster, clean up comments (GH-28177)

Browse source 
* Improve comments

* Check cls is a type, remove dict calculation
This commit is contained in:
Ken Jin 2021-09-17 18:47:36 +08:00 • committed by GitHub
parent b0a6ede3d0
commit 70bed6f993
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Python/ceval.c
View file

@ -4496,6 +4496,7 @@ check_eval_breaker:
}
TARGET(LOAD_METHOD_MODULE): {
/* LOAD_METHOD, for module methods */
assert(cframe.use_tracing == 0);
PyObject *owner = TOP();
PyObject *res;
@ -4515,15 +4516,9 @@ check_eval_breaker:
_PyObjectCache *cache2 = &caches[-2].obj;
PyObject *cls = TOP();
PyTypeObject *cls_type = Py_TYPE(cls);
assert(cls_type->tp_dictoffset > 0);
PyObject *dict = *(PyObject **) ((char *)cls + cls_type->tp_dictoffset);
// Don't care if no dict -- tp_version_tag should catch anything wrong.
DEOPT_IF(dict != NULL && ((PyDictObject *)dict)->ma_keys->dk_version !=
cache1->dk_version_or_hint, LOAD_METHOD);
DEOPT_IF(!PyType_Check(cls), LOAD_METHOD);
DEOPT_IF(((PyTypeObject *)cls)->tp_version_tag != cache1->tp_version,
LOAD_METHOD);
assert(cache1->dk_version_or_hint != 0);
assert(cache1->tp_version != 0);
STAT_INC(LOAD_METHOD, hit);