Resolve merge conflict

Eclips4 · Eclips4 · commit 7ef50091a361 · 2025-04-13T17:32:03.000+03:00
diff --git a/Include/internal/pycore_optimizer.h b/Include/internal/pycore_optimizer.h
@@ -90,7 +90,7 @@ PyAPI_FUNC(_PyExecutorObject*) _Py_GetExecutor(PyCodeObject *code, int offset);
 
 void _Py_ExecutorInit(_PyExecutorObject *, const _PyBloomFilter *);
 void _Py_ExecutorDetach(_PyExecutorObject *);
-int _Py_ExecutorClear(_PyExecutorObject *);
+int _Py_ExecutorClear(PyObject *);
 void _Py_BloomFilter_Init(_PyBloomFilter *);
 void _Py_BloomFilter_Add(_PyBloomFilter *bloom, void *obj);
 PyAPI_FUNC(void) _Py_Executor_DependsOn(_PyExecutorObject *executor, void *obj);
diff --git a/Python/optimizer.c b/Python/optimizer.c
@@ -1429,7 +1429,7 @@ _Py_ExecutorDetach(_PyExecutorObject *executor)
 }
 
 int
-_Py_ExecutorClear(_PyExecutorObject *executor)
+_Py_ExecutorClear(PyObject *op)
 {
     _PyExecutorObject *executor = _PyExecutorObject_CAST(op);
     if (!executor->vm_data.valid) {
@@ -1453,7 +1453,7 @@ _Py_ExecutorClear(_PyExecutorObject *executor)
 }
 
 static int
-executor_clear(_PyExecutorObject *executor)
+executor_clear(PyObject *executor)
 {
     return _Py_ExecutorClear(executor);
 }

Original file line number	Diff line number	Diff line change
`@@ -1429,7 +1429,7 @@ _Py_ExecutorDetach(_PyExecutorObject *executor)`
`1429`	`1429`	`}`
`1430`	`1430`
`1431`	`1431`	`int`
`1432`		`-_Py_ExecutorClear(_PyExecutorObject *executor)`
	`1432`	`+_Py_ExecutorClear(PyObject *op)`
`1433`	`1433`	`{`
`1434`	`1434`	`_PyExecutorObject *executor = _PyExecutorObject_CAST(op);`
`1435`	`1435`	`if (!executor->vm_data.valid) {`
`@@ -1453,7 +1453,7 @@ _Py_ExecutorClear(_PyExecutorObject *executor)`
`1453`	`1453`	`}`
`1454`	`1454`
`1455`	`1455`	`static int`
`1456`		`-executor_clear(_PyExecutorObject *executor)`
	`1456`	`+executor_clear(PyObject *executor)`
`1457`	`1457`	`{`
`1458`	`1458`	`return _Py_ExecutorClear(executor);`
`1459`	`1459`	`}`