pythongh-124058: remove c_interactive from the compiler struct

Author: iritkatriel

Include/internal/pycore_compile.h

@@ -133,8 +133,6 @@ int _PyCompile_LookupCellvar(struct _PyCompiler *c, PyObject *name);
 int _PyCompile_ResolveNameop(struct _PyCompiler *c, PyObject *mangled, int scope,
                              _PyCompile_optype *optype, Py_ssize_t *arg);
 
-int _PyCompile_IsInteractive(struct _PyCompiler *c);
-int _PyCompile_IsNestedScope(struct _PyCompiler *c);
 int _PyCompile_IsInInlinedComp(struct _PyCompiler *c);
 int _PyCompile_ScopeType(struct _PyCompiler *c);
 int _PyCompile_OptimizationLevel(struct _PyCompiler *c);

Python/codegen.c

@@ -742,6 +742,17 @@ _PyCodegen_Expression(compiler *c, expr_ty e)
     return SUCCESS;
 }
 
+static int
+codegen_interactive(compiler *c, location loc, asdl_stmt_seq *stmts)
+{
+    assert(asdl_seq_LEN(stmts) == 1);
+    stmt_ty s = (stmt_ty)asdl_seq_GET(stmts, 0);
+    VISIT(c, expr, s->v.Expr.value);
+    ADDOP_I(c, loc, CALL_INTRINSIC_1, INTRINSIC_PRINT);
+    ADDOP(c, NO_LOCATION, POP_TOP);
+    return SUCCESS;
+}
+
 /* Compile a sequence of statements, checking for a docstring
    and for annotations. */
 
@@ -775,9 +786,12 @@ _PyCodegen_Body(compiler *c, location loc, asdl_stmt_seq *stmts, bool is_interac
             Py_DECREF(cleandoc);
             RETURN_IF_ERROR(codegen_nameop(c, NO_LOCATION, &_Py_ID(__doc__), Store));
         }
+        for (Py_ssize_t i = first_instr; i < asdl_seq_LEN(stmts); i++) {
+            VISIT(c, stmt, (stmt_ty)asdl_seq_GET(stmts, i));
+        }
     }
-    for (Py_ssize_t i = first_instr; i < asdl_seq_LEN(stmts); i++) {
-        VISIT(c, stmt, (stmt_ty)asdl_seq_GET(stmts, i));
+    else {
+        RETURN_IF_ERROR(codegen_interactive(c, loc, stmts));
     }
     // If there are annotations and the future import is not on, we
     // collect the annotations in a separate pass and generate an
@@ -2823,13 +2837,6 @@ codegen_assert(compiler *c, stmt_ty s)
 static int
 codegen_stmt_expr(compiler *c, location loc, expr_ty value)
 {
-    if (IS_INTERACTIVE(c) && !IS_NESTED_SCOPE(c)) {
-        VISIT(c, expr, value);
-        ADDOP_I(c, loc, CALL_INTRINSIC_1, INTRINSIC_PRINT);
-        ADDOP(c, NO_LOCATION, POP_TOP);
-        return SUCCESS;
-    }
-
     if (value->kind == Constant_kind) {
         /* ignore constant statement */
         ADDOP(c, loc, NOP);

Python/compile.c

@@ -83,7 +83,6 @@ typedef struct _PyCompiler {
     PyCompilerFlags c_flags;
 
     int c_optimize;              /* optimization level */
-    int c_interactive;           /* true if in interactive mode */
     PyObject *c_const_cache;     /* Python dict holding all constants,
                                     including names tuple */
     struct compiler_unit *u;     /* compiler state for current block */
@@ -794,7 +793,6 @@ compiler_codegen(compiler *c, mod_ty mod)
         break;
     }
     case Interactive_kind: {
-        c->c_interactive = 1;
         asdl_stmt_seq *stmts = mod->v.Interactive.body;
         RETURN_IF_ERROR(_PyCodegen_Body(c, start_location(stmts), stmts, true));
         break;
@@ -1203,20 +1201,6 @@ _PyCompile_OptimizationLevel(compiler *c)
     return c->c_optimize;
 }
 
-int
-_PyCompile_IsInteractive(compiler *c)
-{
-    return c->c_interactive;
-}
-
-int
-_PyCompile_IsNestedScope(compiler *c)
-{
-    assert(c->c_stack != NULL);
-    assert(PyList_CheckExact(c->c_stack));
-    return PyList_GET_SIZE(c->c_stack) > 0;
-}
-
 int
 _PyCompile_ScopeType(compiler *c)
 {