gh-111178: Fix function signatures in Python-ast.c (#124942)

python · Oct 4, 2024 · 6c7d5c6 · 6c7d5c6
1 parent f66d785
commit 6c7d5c6
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 14 deletions.
diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py
@@ -843,8 +843,9 @@ def visitModule(self, mod):
 } AST_object;
 
 static void
-ast_dealloc(AST_object *self)
+ast_dealloc(PyObject *op)
 {
+ AST_object *self = (AST_object*)op;
  /* bpo-31095: UnTrack is needed before calling any callbacks */
  PyTypeObject *tp = Py_TYPE(self);
  PyObject_GC_UnTrack(self);
@@ -856,16 +857,18 @@ def visitModule(self, mod):
 }
 
 static int
-ast_traverse(AST_object *self, visitproc visit, void *arg)
+ast_traverse(PyObject *op, visitproc visit, void *arg)
 {
+ AST_object *self = (AST_object*)op;
  Py_VISIT(Py_TYPE(self));
  Py_VISIT(self->dict);
  return 0;
 }
 
 static int
-ast_clear(AST_object *self)
+ast_clear(PyObject *op)
 {
+ AST_object *self = (AST_object*)op;
  Py_CLEAR(self->dict);
  return 0;
 }
@@ -1651,9 +1654,9 @@ def visitModule(self, mod):
 }
 
 static PyObject *
-ast_repr(AST_object *self)
+ast_repr(PyObject *self)
 {
- return ast_repr_max_depth(self, 3);
+ return ast_repr_max_depth((AST_object*)self, 3);
 }
 
 static PyType_Slot AST_type_slots[] = {
@@ -1847,8 +1850,9 @@ def visitModule(self, mod):
 
  self.file.write(textwrap.dedent('''
  static int
- init_types(struct ast_state *state)
+ init_types(void *arg)
  {
+ struct ast_state *state = arg;
  if (init_identifiers(state) < 0) {
  return -1;
  }
@@ -2296,7 +2300,7 @@ def generate_module_def(mod, metadata, f, internal_h):
  };
 
  // Forward declaration
- static int init_types(struct ast_state *state);
+ static int init_types(void *arg);
 
  static struct ast_state*
  get_ast_state(void)

diff --git a/Python/Python-ast.c b/Python/Python-ast.c