Skip to content

gh-132399: fix invalid function signatures on the free-threaded build #132400

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 4 commits into from
Apr 12, 2025
Merged

gh-132399: fix invalid function signatures on the free-threaded build #132400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
44c867a
free-threaded build: fix compile-time invalid function pointers
picnixz Apr 9, 2025
71879a7
temporary patch for mis-aligned read/write
picnixz Apr 10, 2025
fe6ba71
fix UB in `get_code_with_unused_tlbc`
picnixz Apr 10, 2025
bcb59e2
Revert "temporary patch for mis-aligned read/write"
picnixz Apr 12, 2025
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
5 changes: 3 additions & 2 deletions Objects/codeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2996,8 +2996,9 @@ is_bytecode_unused(_PyCodeArray *tlbc, Py_ssize_t idx,
}

static int
get_code_with_unused_tlbc(PyObject *obj, struct get_code_args *args)
get_code_with_unused_tlbc(PyObject *obj, void *data)
{
struct get_code_args *args = (struct get_code_args *) data;
if (!PyCode_Check(obj)) {
return 1;
}
Expand Down Expand Up @@ -3046,7 +3047,7 @@ _Py_ClearUnusedTLBC(PyInterpreterState *interp)
}
// Collect code objects that have bytecode not in use by any thread
_PyGC_VisitObjectsWorldStopped(
interp, (gcvisitobjects_t)get_code_with_unused_tlbc, &args);
interp, get_code_with_unused_tlbc, &args);
if (args.err < 0) {
goto err;
}
Expand Down
26 changes: 18 additions & 8 deletions Python/gc_free_threading.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -688,6 +688,12 @@ gc_mark_enqueue_no_buffer(PyObject *op, gc_mark_args_t *args)
return 0;
}

static inline int
gc_mark_enqueue_no_buffer_visitproc(PyObject *op, void *args)
{
return gc_mark_enqueue_no_buffer(op, (gc_mark_args_t *)args);
}

static int
gc_mark_enqueue_buffer(PyObject *op, gc_mark_args_t *args)
{
Expand All @@ -701,6 +707,12 @@ gc_mark_enqueue_buffer(PyObject *op, gc_mark_args_t *args)
}
}

static inline int
gc_mark_enqueue_buffer_visitproc(PyObject *op, void *args)
{
return gc_mark_enqueue_buffer(op, (gc_mark_args_t *)args);
}

// Called when we find an object that needs to be marked alive (either from a
// root or from calling tp_traverse).
static int
Expand Down Expand Up @@ -986,12 +998,12 @@ update_refs(const mi_heap_t *heap, const mi_heap_area_t *area,
}

static int
visit_clear_unreachable(PyObject *op, _PyObjectStack *stack)
visit_clear_unreachable(PyObject *op, void *stack)
{
if (gc_is_unreachable(op)) {
_PyObject_ASSERT(op, _PyObject_GC_IS_TRACKED(op));
gc_clear_unreachable(op);
return _PyObjectStack_Push(stack, op);
return _PyObjectStack_Push((_PyObjectStack *)stack, op);
}
return 0;
}
Expand All @@ -1003,7 +1015,7 @@ mark_reachable(PyObject *op)
_PyObjectStack stack = { NULL };
do {
traverseproc traverse = Py_TYPE(op)->tp_traverse;
if (traverse(op, (visitproc)&visit_clear_unreachable, &stack) < 0) {
if (traverse(op, visit_clear_unreachable, &stack) < 0) {
_PyObjectStack_Clear(&stack);
return -1;
}
Expand Down Expand Up @@ -1273,7 +1285,7 @@ gc_propagate_alive_prefetch(gc_mark_args_t *args)
return -1;
}
}
else if (traverse(op, (visitproc)&gc_mark_enqueue_buffer, args) < 0) {
else if (traverse(op, gc_mark_enqueue_buffer_visitproc, args) < 0) {
return -1;
}
}
Expand All @@ -1294,7 +1306,7 @@ gc_propagate_alive(gc_mark_args_t *args)
assert(_PyObject_GC_IS_TRACKED(op));
assert(gc_is_alive(op));
traverseproc traverse = Py_TYPE(op)->tp_traverse;
if (traverse(op, (visitproc)&gc_mark_enqueue_no_buffer, args) < 0) {
if (traverse(op, gc_mark_enqueue_no_buffer_visitproc, args) < 0) {
return -1;
}
}
Expand Down Expand Up @@ -1751,9 +1763,7 @@ handle_resurrected_objects(struct collection_state *state)
op->ob_ref_local -= 1;

traverseproc traverse = Py_TYPE(op)->tp_traverse;
(void) traverse(op,
(visitproc)visit_decref_unreachable,
NULL);
(void)traverse(op, visit_decref_unreachable, NULL);
}

// Find resurrected objects
Expand Down
Loading