Cleanup

pablogsal · pablogsal · commit 3cc6c4035598 · 2022-08-20T18:24:52.000+01:00
diff --git a/Include/cpython/code.h b/Include/cpython/code.h
@@ -32,7 +32,6 @@ typedef uint16_t _Py_CODEUNIT;
 #define _Py_SET_OPCODE(word, opcode) \
     do { ((unsigned char *)&(word))[0] = (opcode); } while (0)
 
-
 // To avoid repeating ourselves in deepfreeze.py, all PyCodeObject members are
 // defined in this macro:
 #define _PyCode_DEF(SIZE) {                                                    \
diff --git a/Include/internal/pycore_ceval.h b/Include/internal/pycore_ceval.h
@@ -25,7 +25,7 @@ struct _ceval_runtime_state;
 
 #include "pycore_interp.h"        // PyInterpreterState.eval_frame
 #include "pycore_pystate.h"       // _PyThreadState_GET()
-#include "pycore_frame.h"       // _PyThreadState_GET()
+
 
 extern void _Py_FinishPendingCalls(PyThreadState *tstate);
 extern void _PyEval_InitRuntimeState(struct _ceval_runtime_state *);
diff --git a/Objects/codeobject.c b/Objects/codeobject.c
@@ -1401,36 +1401,18 @@ _PyCode_GetVarnames(PyCodeObject *co)
     return get_localsplus_names(co, CO_FAST_LOCAL, co->co_nlocals);
 }
 
-PyObject *
-PyCode_GetVarnames(PyCodeObject *code)
-{
-    return _PyCode_GetVarnames(code);
-}
-
 PyObject *
 _PyCode_GetCellvars(PyCodeObject *co)
 {
     return get_localsplus_names(co, CO_FAST_CELL, co->co_ncellvars);
 }
 
-PyObject *
-PyCode_GetCellvars(PyCodeObject *code)
-{
-    return _PyCode_GetCellvars(code);
-}
-
 PyObject *
 _PyCode_GetFreevars(PyCodeObject *co)
 {
     return get_localsplus_names(co, CO_FAST_FREE, co->co_nfreevars);
 }
 
-PyObject *
-PyCode_GetFreevars(PyCodeObject *code)
-{
-    return _PyCode_GetFreevars(code);
-}
-
 static void
 deopt_code(_Py_CODEUNIT *instructions, Py_ssize_t len)
 {
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -4874,7 +4874,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
             function = PEEK(total_args + 1);
             int positional_args = total_args - KWNAMES_LEN();
             // Check if the call can be inlined or not
-            if (0 && Py_TYPE(function) == &PyFunction_Type && tstate->interp->eval_frame == NULL) {
+            if (Py_TYPE(function) == &PyFunction_Type && tstate->interp->eval_frame == NULL) {
                 int code_flags = ((PyCodeObject*)PyFunction_GET_CODE(function))->co_flags;
                 PyObject *locals = code_flags & CO_OPTIMIZED ? NULL : Py_NewRef(PyFunction_GET_GLOBALS(function));
                 STACK_SHRINK(total_args);

Original file line number	Diff line number	Diff line change
`@@ -1401,36 +1401,18 @@ _PyCode_GetVarnames(PyCodeObject *co)`
`1401`	`1401`	`return get_localsplus_names(co, CO_FAST_LOCAL, co->co_nlocals);`
`1402`	`1402`	`}`
`1403`	`1403`
`1404`		`-PyObject *`
`1405`		`-PyCode_GetVarnames(PyCodeObject *code)`
`1406`		`-{`
`1407`		`- return _PyCode_GetVarnames(code);`
`1408`		`-}`
`1409`		`-`
`1410`	`1404`	`PyObject *`
`1411`	`1405`	`_PyCode_GetCellvars(PyCodeObject *co)`
`1412`	`1406`	`{`
`1413`	`1407`	`return get_localsplus_names(co, CO_FAST_CELL, co->co_ncellvars);`
`1414`	`1408`	`}`
`1415`	`1409`
`1416`		`-PyObject *`
`1417`		`-PyCode_GetCellvars(PyCodeObject *code)`
`1418`		`-{`
`1419`		`- return _PyCode_GetCellvars(code);`
`1420`		`-}`
`1421`		`-`
`1422`	`1410`	`PyObject *`
`1423`	`1411`	`_PyCode_GetFreevars(PyCodeObject *co)`
`1424`	`1412`	`{`
`1425`	`1413`	`return get_localsplus_names(co, CO_FAST_FREE, co->co_nfreevars);`
`1426`	`1414`	`}`
`1427`	`1415`
`1428`		`-PyObject *`
`1429`		`-PyCode_GetFreevars(PyCodeObject *code)`
`1430`		`-{`
`1431`		`- return _PyCode_GetFreevars(code);`
`1432`		`-}`
`1433`		`-`
`1434`	`1416`	`static void`
`1435`	`1417`	`deopt_code(_Py_CODEUNIT *instructions, Py_ssize_t len)`
`1436`	`1418`	`{`