8000 gh-90667: Add specializations of Py_DECREF when types are known by sweeneyde · Pull Request #30872 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-90667: Add specializations of Py_DECREF when types are known #30872

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 18 commits into from
Apr 19, 2022
Merged

gh-90667: Add specializations of Py_DECREF when types are known #30872

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
ffe7d7b
Add specializations of Py_DECREF when types are known
sweeneyde Jan 23, 2022
d2d7b6f
📜🤖 Added by blurb_it.
blurb-it[bot] Jan 25, 2022
5cb77fd
Strings should be freed with unicode_dealloc, not PyObject_Free!
sweeneyde Jan 25, 2022
f58ebcf
_Py_DECREF_IMMORTAL
sweeneyde Jan 25, 2022
0046cd7
Remove a layer of macros. Retain _Py_DECREF_INT for private use in lo…
sweeneyde Jan 25, 2022
8edfa4d
Hide more functions
sweeneyde Jan 26, 2022
d095c43
Use PyAPI_FUNC again
sweeneyde Jan 27, 2022
fa6a26a
Use PyObject* to avoid casts
sweeneyde Jan 27, 2022
35c0d25
Remove PyAPI_FUNC and mathmodule optimizations
sweeneyde Jan 27, 2022
feebdb3
Use _Py_FataRefcountError() directly. Move it to the same header file.
sweeneyde Jan 28, 2022
05b050b
remove (destructor) cast in bltinmodule and longobject
sweeneyde Jan 29, 2022
0d6a598
Add newline at end of NEWS entry
sweeneyde Feb 11, 2022
731f79d
Merge remote-tracking branch 'upstream/main' into special_decref
sweeneyde Feb 11, 2022
d5f49b2
Merge with main: resolve boolobject.c includes
sweeneyde Feb 24, 2022
b331bf8
merge with main
sweeneyde Apr 12, 2022
ad146ef
naming: IMMORTAL --> NO_DEALLOC
sweeneyde Apr 12, 2022
ec763e6
mrege with main
sweeneyde Apr 18, 2022
3dd308a
Remove _PyLong_ExactDealloc
sweeneyde Apr 19, 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
Prev Previous commit
Next Next commit
Use _Py_FataRefcountError() directly. Move it to the same header file.
  • Loading branch information
@sweeneyde
sweeneyde committed Jan 28, 2022
commit feebdb32d1f414dd63d5a91cf727ce2bd6058f10
10 changes: 7 additions & 3 deletions Include/internal/pycore_object.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ extern "C" {
#include "pycore_interp.h" // PyInterpreterState.gc
#include "pycore_pystate.h" // _PyInterpreterState_GET()


#define _PyObject_IMMORTAL_INIT(type) \
{ \
.ob_refcnt = 999999999, \
Expand All @@ -24,6 +23,12 @@ extern "C" {
.ob_size = size, \
}

PyAPI_FUNC(void) _Py_NO_RETURN _Py_FatalRefcountErrorFunc(
const char *func,
const char *message);

#define _Py_FatalRefcountError(message) _Py_FatalRefcountErrorFunc(__func__, message)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OOI, why move this?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was trying to avoid a dependence between the pycore_... includes. The unicodeobject.c and tupleobject.c implementations both only used pycore_pyerrors for _Py_FatalRefcountError(), which doesn't really concern itself with the implementation details of exceptions.


static inline void
_Py_DECREF_SPECIALIZED(PyObject *op, const destructor destruct)
{
Expand All @@ -50,8 +55,7 @@ _Py_DECREF_IMMORTAL(PyObject *op)
op->ob_refcnt--;
#ifdef Py_DEBUG
if (op->ob_refcnt <= 0) {
// Calls _Py_FatalRefcountError for None, True, and False
_Py_Dealloc(op);
_Py_FatalRefcountError("deallocating a singleton");
}
#endif
}
Expand Down
7 changes: 0 additions & 7 deletions Include/internal/pycore_pyerrors.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,6 @@ extern PyObject* _Py_Offer_Suggestions(PyObject* exception);
PyAPI_FUNC(Py_ssize_t) _Py_UTF8_Edit_Cost(PyObject *str_a, PyObject *str_b,
Py_ssize_t max_cost);

PyAPI_FUNC(void) _Py_NO_RETURN _Py_FatalRefcountErrorFunc(
const char *func,
const char *message);

#define _Py_FatalRefcountError(message) _Py_FatalRefcountErrorFunc(__func__, message)


#ifdef __cplusplus
}
#endif
Expand Down
2 changes: 1 addition & 1 deletion Objects/boolobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* Boolean type, a subtype of int */

#include "Python.h"
#include "pycore_pyerrors.h" // _Py_FatalRefcountError()
#include "pycore_object.h" // _Py_FatalRefcountError()

/* We define bool_repr to return "False" or "True" */

Expand Down
2 changes: 1 addition & 1 deletion Objects/object.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "pycore_floatobject.h" // _PyFloat_DebugMallocStats()
#include "pycore_initconfig.h" // _PyStatus_EXCEPTION()
#include "pycore_namespace.h" // _PyNamespace_Type
#include "pycore_object.h" // _PyType_CheckConsistency()
#include "pycore_object.h" // _PyType_CheckConsistency(), _Py_FatalRefcountError()
#include "pycore_pyerrors.h" // _PyErr_Occurred()
#include "pycore_pymem.h" // _PyMem_IsPtrFreed()
#include "pycore_pystate.h" // _PyThreadState_GET()
Expand Down
3 changes: 1 addition & 2 deletions Objects/tupleobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
#include "pycore_abstract.h" // _PyIndex_Check()
#include "pycore_gc.h" // _PyObject_GC_IS_TRACKED()
#include "pycore_initconfig.h" // _PyStatus_OK()
#include "pycore_object.h" // _PyObject_GC_TRACK()
#include "pycore_pyerrors.h" // _Py_FatalRefcountError()
#include "pycore_object.h" // _PyObject_GC_TRACK(), _Py_FatalRefcountError()
#include "pycore_tuple.h" // struct _Py_tuple_state()

/*[clinic input]
Expand Down
3 changes: 1 addition & 2 deletions Objects/unicodeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,8 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "pycore_initconfig.h" // _PyStatus_OK()
#include "pycore_interp.h" // PyInterpreterState.fs_codec
#include "pycore_long.h" // _PyLong_FormatWriter()
#include "pycore_object.h" // _PyObject_GC_TRACK()
#include "pycore_object.h" // _PyObject_GC_TRACK(), _Py_FatalRefcountError()
#include "pycore_pathconfig.h" // _Py_DumpPathConfig()
#include "pycore_pyerrors.h" // _Py_FatalRefcountError()
#include "pycore_pylifecycle.h" // _Py_SetFileSystemEncoding()
#include "pycore_pystate.h" // _PyInterpreterState_GET()
#include "pycore_ucnhash.h" // _PyUnicode_Name_CAPI
Expand Down
0