remove misc. stuff

xuantengh · xuantengh · commit 12c08f7c3894 · 2025-01-12T23:44:27.000+08:00
diff --git a/Include/internal/pycore_optimizer.h b/Include/internal/pycore_optimizer.h
@@ -146,7 +146,6 @@ int _Py_uop_analyze_and_optimize(struct _PyInterpreterFrame *frame,
     _PyUOpInstruction *trace, int trace_len, int curr_stackentries,
     _PyBloomFilter *dependencies);
 
-extern PyTypeObject _PyCounterExecutor_Type;
 extern PyTypeObject _PyDefaultOptimizer_Type;
 extern PyTypeObject _PyUOpExecutor_Type;
 extern PyTypeObject _PyUOpOptimizer_Type;
diff --git a/Lib/test/test_monitoring.py b/Lib/test/test_monitoring.py
@@ -2004,36 +2004,6 @@ def callback(code, instruction_offset):
         sys.monitoring.set_events(0, 0)
 
 
-@unittest.skipUnless(hasattr(_testinternalcapi, "new_counter_optimizer"),
-                     "Requires counter optimizer")
-class TestOptimizer(MonitoringTestBase, unittest.TestCase):
-
-    def setUp(self):
-        if hasattr(_testinternalcapi, "get_optimizer"):
-            self.old_opt = _testinternalcapi.get_optimizer()
-            opt = _testinternalcapi.new_counter_optimizer()
-            _testinternalcapi.set_optimizer(opt)
-        super(TestOptimizer, self).setUp()
-
-    def tearDown(self):
-        super(TestOptimizer, self).tearDown()
-        import _testinternalcapi
-        if hasattr(_testinternalcapi, "get_optimizer"):
-            _testinternalcapi.set_optimizer(self.old_opt)
-
-    def test_for_loop(self):
-        def test_func(x):
-            i = 0
-            while i < x:
-                i += 1
-
-        code = test_func.__code__
-        sys.monitoring.set_local_events(TEST_TOOL, code, E.PY_START)
-        self.assertEqual(sys.monitoring.get_local_events(TEST_TOOL, code), E.PY_START)
-        test_func(1000)
-        sys.monitoring.set_local_events(TEST_TOOL, code, 0)
-        self.assertEqual(sys.monitoring.get_local_events(TEST_TOOL, code), 0)
-
 class TestTier2Optimizer(CheckEvents):
 
     def test_monitoring_already_opimized_loop(self):
diff --git a/Modules/_testinternalcapi.c b/Modules/_testinternalcapi.c
@@ -1028,12 +1028,6 @@ add_executor_dependency(PyObject *self, PyObject *args)
     if (!PyArg_ParseTuple(args, "OO", &exec, &obj)) {
         return NULL;
     }
-    /* No way to tell in general if exec is an executor, so we only accept
-     * counting_executor */
-    if (strcmp(Py_TYPE(exec)->tp_name, "counting_executor")) {
-        PyErr_SetString(PyExc_TypeError, "argument must be a counting_executor");
-        return NULL;
-    }
     _Py_Executor_DependsOn((_PyExecutorObject *)exec, obj);
     Py_RETURN_NONE;
 }
diff --git a/Objects/object.c b/Objects/object.c
@@ -2379,7 +2379,6 @@ static PyTypeObject* static_types[] = {
     &_PyContextTokenMissing_Type,
     &_PyCoroWrapper_Type,
 #ifdef _Py_TIER2
-    &_PyCounterExecutor_Type,
     &_PyDefaultOptimizer_Type,
 #endif
     &_Py_GenericAliasIterType,
diff --git a/Python/optimizer.c b/Python/optimizer.c
@@ -1326,25 +1326,6 @@ _PyOptimizer_NewUOpOptimizer(void)
     return (PyObject *)opt;
 }
 
-static void
-counter_dealloc(_PyExecutorObject *self) {
-    /* The optimizer is the operand of the second uop. */
-    PyObject *opt = (PyObject *)self->trace[1].operand0;
-    Py_DECREF(opt);
-    uop_dealloc(self);
-}
-
-PyTypeObject _PyCounterExecutor_Type = {
-    PyVarObject_HEAD_INIT(&PyType_Type, 0)
-    .tp_name = "counting_executor",
-    .tp_basicsize = offsetof(_PyExecutorObject, exits),
-    .tp_itemsize = 1,
-    .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_DISALLOW_INSTANTIATION | Py_TPFLAGS_HAVE_GC,
-    .tp_dealloc = (destructor)counter_dealloc,
-    .tp_methods = executor_methods,
-    .tp_traverse = executor_traverse,
-    .tp_clear = (inquiry)executor_clear,
-};
 
 /*****************************************
  *        Executor management
diff --git a/Tools/c-analyzer/cpython/ignored.tsv b/Tools/c-analyzer/cpython/ignored.tsv
@@ -384,7 +384,6 @@ Python/sysmodule.c	-	_PySys_ImplCacheTag	-
 Python/sysmodule.c	-	_PySys_ImplName	-
 Python/sysmodule.c	-	whatstrings	-
 Python/optimizer.c	-	_PyDefaultOptimizer_Type	-
-Python/optimizer.c	-	_PyCounterExecutor_Type	-
 Python/optimizer.c	-	_PyUOpExecutor_Type	-
 Python/optimizer.c	-	_PyUOpOptimizer_Type	-
 Python/optimizer.c	-	_PyOptimizer_Default	-

Original file line number	Diff line number	Diff line change
`@@ -1028,12 +1028,6 @@ add_executor_dependency(PyObject self, PyObject args)`
`1028`	`1028`	`if (!PyArg_ParseTuple(args, "OO", &exec, &obj)) {`
`1029`	`1029`	`return NULL;`
`1030`	`1030`	`}`
`1031`		`- /* No way to tell in general if exec is an executor, so we only accept`
`1032`		`- * counting_executor */`
`1033`		`- if (strcmp(Py_TYPE(exec)->tp_name, "counting_executor")) {`
`1034`		`- PyErr_SetString(PyExc_TypeError, "argument must be a counting_executor");`
`1035`		`- return NULL;`
`1036`		`- }`
`1037`	`1031`	`_Py_Executor_DependsOn((_PyExecutorObject *)exec, obj);`
`1038`	`1032`	`Py_RETURN_NONE;`
`1039`	`1033`	`}`