Cleanup

Author: Fidget-Spinner

Python/ceval.c

@@ -821,8 +821,8 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
     int lltrace = 0;
 #endif
 
-    _PyInterpreterFrame  e;
-    _PyInterpreterFrame *entry_frame = &e;
+    _PyInterpreterFrame entry_f;
+    _PyInterpreterFrame *entry_frame = &entry_f;
 
 
 
@@ -834,14 +834,14 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
     e.f_globals = (PyObject*)0xaaa3;
     e.f_builtins = (PyObject*)0xaaa4;
 #endif
-    e.f_executable = PyStackRef_None;
-    e.instr_ptr = (_Py_CODEUNIT *)_Py_INTERPRETER_TRAMPOLINE_INSTRUCTIONS + 1;
-    e.stackpointer = e.localsplus;
-    e.owner = FRAME_OWNED_BY_CSTACK;
-    e.visited = 0;
-    e.return_offset = 0;
+    entry_f.f_executable = PyStackRef_None;
+    entry_f.instr_ptr = (_Py_CODEUNIT *)_Py_INTERPRETER_TRAMPOLINE_INSTRUCTIONS + 1;
+    entry_f.stackpointer = entry_f.localsplus;
+    entry_f.owner = FRAME_OWNED_BY_CSTACK;
+    entry_f.visited = 0;
+    entry_f.return_offset = 0;
     /* Push frame */
-    e.previous = tstate->current_frame;
+    entry_f.previous = tstate->current_frame;
     frame->previous = entry_frame;
     tstate->current_frame = frame;
 

Tools/cases_generator/tier1_tail_call_generator.py

@@ -4,7 +4,6 @@
 """
 
 import argparse
-import re
 
 from typing import TextIO
 
@@ -60,7 +59,7 @@ def error_handler(out: CWriter, body: str, next: str, emit_tail_call: bool = Tru
 
 
 def generate_tier1(
-        filenames: list[str], analysis: Analysis, outfile: TextIO, lines: bool
+    filenames: list[str], analysis: Analysis, outfile: TextIO, lines: bool
 ) -> None:
     write_header(__file__, filenames, outfile)
     outfile.write(
@@ -217,7 +216,6 @@ def generate_tier1(
         out.emit("\n")
         out.emit(function_proto(name))
         out.emit("{\n")
-        # out.emit(f'printf("{name}\\n");\n')
         out.emit("int opcode = next_instr->op.code;\n")
         out.emit("{\n")
         write_single_inst(out, emitter, name, inst)