Skip to content

GH-90699: use statically allocated interned strings in typeobject's slotdefs #94706

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Sep 7, 2022
Merged

GH-90699: use statically allocated interned strings in typeobject's slotdefs #94706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bf84334
use static strings
kumaraditya303 Jun 12, 2022
40d09f0
Merge branch 'main' of https://github.com/python/cpython into slotdefs
kumaraditya303 Aug 28, 2022
56cb979
fix merge
kumaraditya303 Aug 28, 2022
f706aed
Merge branch 'main' of https://github.com/python/cpython into slotdefs
kumaraditya303 Sep 4, 2022
f72646e
rework without arg
kumaraditya303 Sep 4, 2022
fd34ed3
remove quotes
kumaraditya303 Sep 4, 2022
5c34bb7
fix list
kumaraditya303 Sep 7, 2022
b835ddc
Merge branch 'main' into slotdefs
kumaraditya303 Sep 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions Include/internal/pycore_typeobject.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ extern "C" {

/* runtime lifecycle */

extern PyStatus _PyTypes_InitState(PyInterpreterState *);
extern PyStatus _PyTypes_InitTypes(PyInterpreterState *);
extern void _PyTypes_FiniTypes(PyInterpreterState *);
extern void _PyTypes_Fini(PyInterpreterState *);
Expand Down Expand Up @@ -67,8 +66,6 @@ struct types_state {
};


extern PyStatus _PyTypes_InitSlotDefs(void);

extern int _PyStaticType_InitBuiltin(PyTypeObject *type);
extern static_builtin_state * _PyStaticType_GetState(PyTypeObject *);
extern void _PyStaticType_ClearWeakRefs(PyTypeObject *type);
Expand Down
18 changes: 0 additions & 18 deletions Objects/object.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#include "pycore_pymem.h" // _PyMem_IsPtrFreed()
#include "pycore_pystate.h" // _PyThreadState_GET()
#include "pycore_symtable.h" // PySTEntry_Type
#include "pycore_typeobject.h" // _PyTypes_InitSlotDefs()
#include "pycore_unionobject.h" // _PyUnion_Type
#include "pycore_interpreteridobject.h" // _PyInterpreterID_Type

Expand Down Expand Up @@ -1835,23 +1834,6 @@ PyObject _Py_NotImplementedStruct = {
1, &_PyNotImplemented_Type
};

PyStatus
_PyTypes_InitState(PyInterpreterState *interp)
{
if (!_Py_IsMainInterpreter(interp)) {
return _PyStatus_OK();
}

PyStatus status = _PyTypes_InitSlotDefs();
if (_PyStatus_EXCEPTION(status)) {
return status;
}

return _PyStatus_OK();
}



#ifdef MS_WINDOWS
extern PyTypeObject PyHKEY_Type;
#endif
Expand Down
Loading