remove _PyOptimizer_NewCounter

brandtbucher · Jan 16, 2025 · Nov 11, 2024 · Nov 15, 2024 · Nov 15, 2024 · Nov 15, 2024
commit a5bd3f1fa3a58431b66a2bb9514675e7e5f10e8b
diff --git a/Include/internal/pycore_optimizer.h b/Include/internal/pycore_optimizer.h
@@ -119,7 +119,6 @@ PyAPI_FUNC(void) _Py_Executor_DependsOn(_PyExecutorObject *executor, void *obj);
 // Export for '_testinternalcapi' shared extension.
 PyAPI_FUNC(_PyOptimizerObject *) _Py_GetOptimizer(void);
 PyAPI_FUNC(int) _Py_SetTier2Optimizer(_PyOptimizerObject* optimizer);
-PyAPI_FUNC(PyObject *) _PyOptimizer_NewCounter(void);
 PyAPI_FUNC(PyObject *) _PyOptimizer_NewUOpOptimizer(void);
 
 #define _Py_MAX_ALLOWED_BUILTINS_MODIFICATIONS 3

diff --git a/Lib/test/test_monitoring.py b/Lib/test/test_monitoring.py
@@ -2085,35 +2085,6 @@ def callback(code, instruction_offset):
         sys.monitoring.set_events(0, 0)
 
 
-class TestOptimizer(MonitoringTestBase, unittest.TestCase):
-
-    def setUp(self):
-        _testinternalcapi = import_module("_testinternalcapi")
-        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
@@ -989,12 +989,6 @@ get_co_framesize(PyObject *self, PyObject *arg)
 
 #ifdef _Py_TIER2
 
-static PyObject *
-new_counter_optimizer(PyObject *self, PyObject *arg)
-{
-    return _PyOptimizer_NewCounter();
-}
-
 static PyObject *
 new_uop_optimizer(PyObject *self, PyObject *arg)
 {
@@ -2101,7 +2095,6 @@ static PyMethodDef module_functions[] = {
 #ifdef _Py_TIER2
     {"get_optimizer", get_optimizer,  METH_NOARGS, NULL},
     {"set_optimizer", set_optimizer,  METH_O, NULL},
-    {"new_counter_optimizer", new_counter_optimizer, METH_NOARGS, NULL},
     {"new_uop_optimizer", new_uop_optimizer, METH_NOARGS, NULL},
     {"add_executor_dependency", add_executor_dependency, METH_VARARGS, NULL},
     {"invalidate_executors", invalidate_executors, METH_O, NULL},

@@ -1410,18 +1410,6 @@ PyTypeObject _PyCounterOptimizer_Type = {
     .tp_dealloc = (destructor)PyObject_Free,
 };
 
-PyObject *
-_PyOptimizer_NewCounter(void)
-{
-    _PyCounterOptimizerObject *opt = (_PyCounterOptimizerObject *)_PyObject_New(&_PyCounterOptimizer_Type);
-    if (opt == NULL) {
-        return NULL;
-    }
-    opt->base.optimize = counter_optimize;
-    opt->count = 0;
-    return (PyObject *)opt;
-}
-
 
 /*****************************************
  *        Executor management