May 16, 2023 · Apr 9, 2023 · Apr 13, 2023 · Apr 13, 2023 · Apr 13, 2023 · Apr 13, 2023
diff --git a/Include/cpython/funcobject.h b/Include/cpython/funcobject.h

 #define COMMON_FIELDS(PREFIX) \
    PyObject *PREFIX ## globals; \
    PyObject *PREFIX ## locals; /* "slow" locals, not fast */ \
    PyObject *PREFIX ## builtins; \
    PyObject *PREFIX ## name; \
    PyObject *PREFIX ## qualname; \
    PyObject *func_weakreflist; /* List of weak references */
    PyObject *func_module;      /* The __module__ attribute, can be anything */
    PyObject *func_annotations; /* Annotations, a dict or NULL */
    PyObject *func_class_dict;  /* Class dict, a dict or NULL */
    vectorcallfunc vectorcall;
    /* Version number for use by specializer.
     * Can set to non-zero when we want to specialize.
 PyAPI_FUNC(PyObject *) PyFunction_NewWithQualName(PyObject *, PyObject *, PyObject *);
 PyAPI_FUNC(PyObject *) PyFunction_GetCode(PyObject *);
 PyAPI_FUNC(PyObject *) PyFunction_GetGlobals(PyObject *);
 PyAPI_FUNC(PyObject *)PyFunction_GetLocals(PyObject *);
 PyAPI_FUNC(PyObject *)PyFunction_GetClassDict(PyObject *);
 PyAPI_FUNC(PyObject *) PyFunction_GetModule(PyObject *);
 PyAPI_FUNC(PyObject *) PyFunction_GetDefaults(PyObject *);
 PyAPI_FUNC(int) PyFunction_SetDefaults(PyObject *, PyObject *);
 }
 #define PyFunction_GET_GLOBALS(func) PyFunction_GET_GLOBALS(_PyObject_CAST(func))

 static inline PyObject*PyFunction_GET_LOCALS(PyObject *func) {
    return _PyFunction_CAST(func)->func_locals;
 static inline PyObject*PyFunction_GET_CLASS_DICT(PyObject *func) {
    return _PyFunction_CAST(func)->func_class_dict;
 }
 #definePyFunction_GET_LOCALS(func)PyFunction_GET_LOCALS(_PyObject_CAST(func))
 #definePyFunction_GET_CLASS_DICT(func)PyFunction_GET_CLASS_DICT(_PyObject_CAST(func))

 static inline PyObject* PyFunction_GET_MODULE(PyObject *func) {
    return _PyFunction_CAST(func)->func_module;
diff --git a/Include/internal/pycore_intrinsics.h b/Include/internal/pycore_intrinsics.h
 /* Binary Functions: */

 #define INTRINSIC_PREP_RERAISE_STAR 1
 #define INTRINSIC_SET_CLASS_DICT    2

 #define MAX_INTRINSIC_21
 #define MAX_INTRINSIC_22


 typedef PyObject *(*instrinsic_func1)(PyThreadState* tstate, PyObject *value);
diff --git a/Include/internal/pycore_opcode.h b/Include/internal/pycore_opcode.h
diff --git a/Include/opcode.h b/Include/opcode.h
diff --git a/Lib/opcode.py b/Lib/opcode.py
 def_op('CALL_INTRINSIC_1', 173)
 def_op('CALL_INTRINSIC_2', 174)

 def_op('LOAD_CLASS_DICT', 175)

 # Instrumented instructions
 MIN_INSTRUMENTED_OPCODE = 238

diff --git a/Objects/frameobject.c b/Objects/frameobject.c
    }
    PyFrameConstructor desc = {
        .fc_globals = globals,
        .fc_locals = NULL,
        .fc_builtins = builtins,
        .fc_name = code->co_name,
        .fc_qualname = code->co_name,
diff --git a/Objects/funcobject.c b/Objects/funcobject.c
        return NULL;
    }
    op->func_globals = Py_NewRef(constr->fc_globals);
    op->func_locals = Py_XNewRef(constr->fc_locals);
    op->func_builtins = Py_NewRef(constr->fc_builtins);
    op->func_name = Py_NewRef(constr->fc_name);
    op->func_qualname = Py_NewRef(constr->fc_qualname);
    op->func_code = Py_NewRef(constr->fc_code);
    op->func_defaults = Py_XNewRef(constr->fc_defaults);
    op->func_kwdefaults = Py_XNewRef(constr->fc_kwdefaults);
    op->func_closure = Py_XNewRef(constr->fc_closure);
    op->func_class_dict = NULL;
    op->func_doc = Py_NewRef(Py_None);
    op->func_dict = NULL;
    op->func_weakreflist = NULL;
       expect a partially-created object. */

    op->func_globals = globals;
    op->func_locals = NULL;
    op->func_builtins = builtins;
    op->func_name = name;
    op->func_qualname = qualname;
    op->func_weakreflist = NULL;
    op->func_module = module;
    op->func_annotations = NULL;
    op->func_class_dict = NULL;
    op->vectorcall = _PyFunction_Vectorcall;
    op->func_version = 0;
    _PyObject_GC_TRACK(op);
 }

 PyObject *
 PyFunction_GetLocals(PyObject *op)
 PyFunction_GetClassDict(PyObject *op)
 {
    if (!PyFunction_Check(op)) {
        PyErr_BadInternalCall();
        return NULL;
    }
    return ((PyFunctionObject *) op) ->func_locals;
    return ((PyFunctionObject *) op) ->func_class_dict;
 }

 PyObject *
    {"__closure__",   T_OBJECT,     OFF(func_closure), READONLY},
    {"__doc__",       T_OBJECT,     OFF(func_doc), 0},
    {"__globals__",   T_OBJECT,     OFF(func_globals), READONLY},
    {"__locals__",    T_OBJECT,     OFF(func_locals), 0},
    {"__module__",    T_OBJECT,     OFF(func_module), 0},
    {"__builtins__",  T_OBJECT,     OFF(func_builtins), READONLY},
    {"__class_dict__",T_OBJECT,     OFF(func_class_dict), READONLY},
    {NULL}  /* Sentinel */
 };

 {
    op->func_version = 0;
    Py_CLEAR(op->func_globals);
    Py_CLEAR(op->func_locals);
    Py_CLEAR(op->func_builtins);
    Py_CLEAR(op->func_module);
    Py_CLEAR(op->func_defaults);
    Py_CLEAR(op->func_dict);
    Py_CLEAR(op->func_closure);
    Py_CLEAR(op->func_annotations);
    Py_CLEAR(op->func_class_dict);
    // Don't Py_CLEAR(op->func_code), since code is always required
    // to be non-NULL. Similarly, name and qualname shouldn't be NULL.
    // However, name and qualname could be str subclasses, so they
 {
    Py_VISIT(f->func_code);
    Py_VISIT(f->func_globals);
    Py_VISIT(f->func_locals);
    Py_VISIT(f->func_builtins);
    Py_VISIT(f->func_module);
    Py_VISIT(f->func_defaults);
    Py_VISIT(f->func_dict);
    Py_VISIT(f->func_closure);
    Py_VISIT(f->func_annotations);
    Py_VISIT(f->func_class_dict);
    Py_VISIT(f->func_qualname);
    return 0;
 }
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
        goto error;
    }

    if (((PyFunctionObject *)func)->func_locals != NULL) {
        const char *msg =
            "__locals__ not set on class body function defining %.200R";
        PyErr_Format(PyExc_RuntimeError, msg, cls);
    }

    PyThreadState *tstate = _PyThreadState_GET();
    EVAL_CALL_STAT_INC(EVAL_CALL_BUILD_CLASS);
    cell = _PyEval_Vector(tstate, (PyFunctionObject *)func, ns, NULL, 0, NULL);
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
            }
        }

        inst(LOAD_CLASS_DICT, ( -- v)) {
            PyObject *name = GETITEM(frame->f_code->co_names, oparg);
            PyFunctionObject *func = (PyFunctionObject *)frame->f_funcobj;
            if (func == NULL) {
                _PyErr_Format(tstate, PyExc_SystemError,
                              "no function defined when loading %R from class dict", name);
                goto error;
            }
            PyObject *class_dict = func->func_class_dict;
            if (class_dict == NULL) {
                _PyErr_Format(tstate, PyExc_SystemError,
                              "no class dict set when loading %R", name);
                goto error;
            }
            if (PyDict_CheckExact(class_dict)) {
                v = PyDict_GetItemWithError(class_dict, name);
                if (v != NULL) {
                    Py_INCREF(v);
                }
            }
            else {
                v = PyObject_GetItem(class_dict, name);
            }
            if (_PyErr_Occurred(tstate)) {
                goto error;
            }
            assert(v != NULL);
        }

        family(load_global, INLINE_CACHE_ENTRIES_LOAD_GLOBAL) = {
            LOAD_GLOBAL,
            LOAD_GLOBAL_MODULE,
                             kwdefaults  if (oparg & 0x02),
                             annotations if (oparg & 0x04),
                             closure     if (oparg & 0x08),
                             locals      if (oparg & 0x20),
                             codeobj -- func)) {

            PyFunctionObject *func_obj = (PyFunctionObject *)
                goto error;
            }

            if (oparg & 0x20) {
                assert(PyDict_CheckExact(locals));
                func_obj->func_locals = locals;
            }
            if (oparg & 0x08) {
                assert(PyTuple_CheckExact(closure));
                func_obj->func_closure = closure;
diff --git a/Python/ceval.c b/Python/ceval.c
    }
    PyFrameConstructor desc = {
        .fc_globals = globals,
        .fc_locals = locals,
        .fc_builtins = builtins,
        .fc_name = ((PyCodeObject *)co)->co_name,
        .fc_qualname = ((PyCodeObject *)co)->co_name,
    }
    PyFrameConstructor constr = {
        .fc_globals = globals,
        .fc_locals = locals,
        .fc_builtins = builtins,
        .fc_name = ((PyCodeObject *)_co)->co_name,
        .fc_qualname = ((PyCodeObject *)_co)->co_name,
diff --git a/Python/compile.c b/Python/compile.c
        ADDOP_I(c, loc, BUILD_TUPLE, co->co_nfreevars);
    }

    /* If flag 0x20 is set, we want to bind func_locals
       to the current locals at runtime.
       Push them on the stack in the right spot.
    */
    if (flags & 0x20) {
        ADDOP(c, loc, LOAD_LOCALS);
    }

    ADDOP_LOAD_CONST(c, loc, (PyObject*)co);
    ADDOP_I(c, loc, MAKE_FUNCTION, flags);
    return SUCCESS;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,7 +10,6 @@ extern "C" {

		#define COMMON_FIELDS(PREFIX) \
		PyObject *PREFIX ## globals; \
		PyObject PREFIX ## locals; / "slow" locals, not fast */ \
		PyObject *PREFIX ## builtins; \
		PyObject *PREFIX ## name; \
		PyObject *PREFIX ## qualname; \
Expand DownExpand Up		@@ -42,6 +41,7 @@ typedef struct {
		PyObject func_weakreflist; / List of weak references */
		PyObject func_module; / The __module__ attribute, can be anything */
		PyObject func_annotations; / Annotations, a dict or NULL */
		PyObject func_class_dict; / Class dict, a dict or NULL */
		vectorcallfunc vectorcall;
		/* Version number for use by specializer.
		* Can set to non-zero when we want to specialize.
Expand All		@@ -68,7 +68,7 @@ PyAPI_FUNC(PyObject ) PyFunction_New(PyObject , PyObject *);
		PyAPI_FUNC(PyObject ) PyFunction_NewWithQualName(PyObject , PyObject , PyObject );
		PyAPI_FUNC(PyObject ) PyFunction_GetCode(PyObject );
		PyAPI_FUNC(PyObject ) PyFunction_GetGlobals(PyObject );
		PyAPI_FUNC(PyObject )PyFunction_GetLocals(PyObject );
		PyAPI_FUNC(PyObject )PyFunction_GetClassDict(PyObject );
JelleZijlstra marked this conversation as resolved. OutdatedShow resolvedHide resolved
		PyAPI_FUNC(PyObject ) PyFunction_GetModule(PyObject );
		PyAPI_FUNC(PyObject ) PyFunction_GetDefaults(PyObject );
		PyAPI_FUNC(int) PyFunction_SetDefaults(PyObject , PyObject );
Expand DownExpand Up		@@ -101,10 +101,10 @@ static inline PyObject* PyFunction_GET_GLOBALS(PyObject *func) {
		}
		#define PyFunction_GET_GLOBALS(func) PyFunction_GET_GLOBALS(_PyObject_CAST(func))

		static inline PyObjectPyFunction_GET_LOCALS(PyObject func) {
		return _PyFunction_CAST(func)->func_locals;
		static inline PyObjectPyFunction_GET_CLASS_DICT(PyObject func) {
		return _PyFunction_CAST(func)->func_class_dict;
		}
		#definePyFunction_GET_LOCALS(func)PyFunction_GET_LOCALS(_PyObject_CAST(func))
		#definePyFunction_GET_CLASS_DICT(func)PyFunction_GET_CLASS_DICT(_PyObject_CAST(func))

		static inline PyObject* PyFunction_GET_MODULE(PyObject *func) {
		return _PyFunction_CAST(func)->func_module;
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,8 +14,9 @@
		/* Binary Functions: */

		#define INTRINSIC_PREP_RERAISE_STAR 1
		#define INTRINSIC_SET_CLASS_DICT 2

		#define MAX_INTRINSIC_21
		#define MAX_INTRINSIC_22


		typedef PyObject (instrinsic_func1)(PyThreadState* tstate, PyObject *value);
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -227,6 +227,8 @@ def pseudo_op(name, op, real_ops):
		def_op('CALL_INTRINSIC_1', 173)
		def_op('CALL_INTRINSIC_2', 174)

		def_op('LOAD_CLASS_DICT', 175)

		# Instrumented instructions
		MIN_INSTRUMENTED_OPCODE = 238

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1071,7 +1071,6 @@ PyFrame_New(PyThreadState tstate, PyCodeObject code,
		}
		PyFrameConstructor desc = {
		.fc_globals = globals,
		.fc_locals = NULL,
		.fc_builtins = builtins,
		.fc_name = code->co_name,
		.fc_qualname = code->co_name,
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -112,14 +112,14 @@ _PyFunction_FromConstructor(PyFrameConstructor *constr)
		return NULL;
		}
		op->func_globals = Py_NewRef(constr->fc_globals);
		op->func_locals = Py_XNewRef(constr->fc_locals);
		op->func_builtins = Py_NewRef(constr->fc_builtins);
		op->func_name = Py_NewRef(constr->fc_name);
		op->func_qualname = Py_NewRef(constr->fc_qualname);
		op->func_code = Py_NewRef(constr->fc_code);
		op->func_defaults = Py_XNewRef(constr->fc_defaults);
		op->func_kwdefaults = Py_XNewRef(constr->fc_kwdefaults);
		op->func_closure = Py_XNewRef(constr->fc_closure);
		op->func_class_dict = NULL;
		op->func_doc = Py_NewRef(Py_None);
		op->func_dict = NULL;
		op->func_weakreflist = NULL;
Expand DownExpand Up		@@ -191,7 +191,6 @@ PyFunction_NewWithQualName(PyObject code, PyObject globals, PyObject *qualname
		expect a partially-created object. */

		op->func_globals = globals;
		op->func_locals = NULL;
		op->func_builtins = builtins;
		op->func_name = name;
		op->func_qualname = qualname;
Expand All		@@ -204,6 +203,7 @@ PyFunction_NewWithQualName(PyObject code, PyObject globals, PyObject *qualname
		op->func_weakreflist = NULL;
		op->func_module = module;
		op->func_annotations = NULL;
		op->func_class_dict = NULL;
		op->vectorcall = _PyFunction_Vectorcall;
		op->func_version = 0;
		_PyObject_GC_TRACK(op);
Expand DownExpand Up		@@ -265,13 +265,13 @@ PyFunction_GetGlobals(PyObject *op)
		}

		PyObject *
		PyFunction_GetLocals(PyObject *op)
		PyFunction_GetClassDict(PyObject *op)
		{
		if (!PyFunction_Check(op)) {
		PyErr_BadInternalCall();
		return NULL;
		}
		return ((PyFunctionObject *) op) ->func_locals;
		return ((PyFunctionObject *) op) ->func_class_dict;
		}

		PyObject *
Expand DownExpand Up		@@ -462,9 +462,9 @@ static PyMemberDef func_memberlist[] = {
		{"__closure__", T_OBJECT, OFF(func_closure), READONLY},
		{"__doc__", T_OBJECT, OFF(func_doc), 0},
		{"__globals__", T_OBJECT, OFF(func_globals), READONLY},
		{"__locals__", T_OBJECT, OFF(func_locals), 0},
		{"__module__", T_OBJECT, OFF(func_module), 0},
		{"__builtins__", T_OBJECT, OFF(func_builtins), READONLY},
		{"__class_dict__",T_OBJECT, OFF(func_class_dict), READONLY},
		{NULL} /* Sentinel */
		};

Expand DownExpand Up		@@ -788,7 +788,6 @@ func_clear(PyFunctionObject *op)
		{
		op->func_version = 0;
		Py_CLEAR(op->func_globals);
		Py_CLEAR(op->func_locals);
		Py_CLEAR(op->func_builtins);
		Py_CLEAR(op->func_module);
		Py_CLEAR(op->func_defaults);
Expand All		@@ -797,6 +796,7 @@ func_clear(PyFunctionObject *op)
		Py_CLEAR(op->func_dict);
		Py_CLEAR(op->func_closure);
		Py_CLEAR(op->func_annotations);
		Py_CLEAR(op->func_class_dict);
		// Don't Py_CLEAR(op->func_code), since code is always required
		// to be non-NULL. Similarly, name and qualname shouldn't be NULL.
		// However, name and qualname could be str subclasses, so they
Expand DownExpand Up		@@ -842,7 +842,6 @@ func_traverse(PyFunctionObject f, visitproc visit, void arg)
		{
		Py_VISIT(f->func_code);
		Py_VISIT(f->func_globals);
		Py_VISIT(f->func_locals);
		Py_VISIT(f->func_builtins);
		Py_VISIT(f->func_module);
		Py_VISIT(f->func_defaults);
Expand All		@@ -852,6 +851,7 @@ func_traverse(PyFunctionObject f, visitproc visit, void arg)
		Py_VISIT(f->func_dict);
		Py_VISIT(f->func_closure);
		Py_VISIT(f->func_annotations);
		Py_VISIT(f->func_class_dict);
		Py_VISIT(f->func_qualname);
		return 0;
		}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -196,12 +196,6 @@ builtin___build_class__(PyObject self, PyObject const *args, Py_ssize_t nargs,
		goto error;
		}

		if (((PyFunctionObject *)func)->func_locals != NULL) {
		const char *msg =
		"__locals__ not set on class body function defining %.200R";
		PyErr_Format(PyExc_RuntimeError, msg, cls);
		}

		PyThreadState *tstate = _PyThreadState_GET();
		EVAL_CALL_STAT_INC(EVAL_CALL_BUILD_CLASS);
		cell = _PyEval_Vector(tstate, (PyFunctionObject *)func, ns, NULL, 0, NULL);
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1219,6 +1219,35 @@ dummy_func(
		}
		}

		inst(LOAD_CLASS_DICT, ( -- v)) {
		PyObject *name = GETITEM(frame->f_code->co_names, oparg);
		PyFunctionObject func = (PyFunctionObject )frame->f_funcobj;
		if (func == NULL) {
		_PyErr_Format(tstate, PyExc_SystemError,
		"no function defined when loading %R from class dict", name);
		goto error;
		}
		PyObject *class_dict = func->func_class_dict;
		if (class_dict == NULL) {
		_PyErr_Format(tstate, PyExc_SystemError,
		"no class dict set when loading %R", name);
		goto error;
		}
		if (PyDict_CheckExact(class_dict)) {
		v = PyDict_GetItemWithError(class_dict, name);
		if (v != NULL) {
		Py_INCREF(v);
		}
		}
		else {
		v = PyObject_GetItem(class_dict, name);
		}
		if (_PyErr_Occurred(tstate)) {
		goto error;
		}
		assert(v != NULL);
		}

		family(load_global, INLINE_CACHE_ENTRIES_LOAD_GLOBAL) = {
		LOAD_GLOBAL,
		LOAD_GLOBAL_MODULE,
Expand DownExpand Up		@@ -3081,7 +3110,6 @@ dummy_func(
		kwdefaults if (oparg & 0x02),
		annotations if (oparg & 0x04),
		closure if (oparg & 0x08),
		locals if (oparg & 0x20),
		codeobj -- func)) {

		PyFunctionObject func_obj = (PyFunctionObject )
Expand All		@@ -3092,10 +3120,6 @@ dummy_func(
		goto error;
		}

		if (oparg & 0x20) {
		assert(PyDict_CheckExact(locals));
		func_obj->func_locals = locals;
		}
		if (oparg & 0x08) {
		assert(PyTuple_CheckExact(closure));
		func_obj->func_closure = closure;
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -549,7 +549,6 @@ PyEval_EvalCode(PyObject co, PyObject globals, PyObject *locals)
		}
		PyFrameConstructor desc = {
		.fc_globals = globals,
		.fc_locals = locals,
		.fc_builtins = builtins,
		.fc_name = ((PyCodeObject *)co)->co_name,
		.fc_qualname = ((PyCodeObject *)co)->co_name,
Expand DownExpand Up		@@ -1584,7 +1583,6 @@ PyEval_EvalCodeEx(PyObject _co, PyObject globals, PyObject *locals,
		}
		PyFrameConstructor constr = {
		.fc_globals = globals,
		.fc_locals = locals,
		.fc_builtins = builtins,
		.fc_name = ((PyCodeObject *)_co)->co_name,
		.fc_qualname = ((PyCodeObject *)_co)->co_name,
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1754,14 +1754,6 @@ compiler_make_closure(struct compiler *c, location loc,
		ADDOP_I(c, loc, BUILD_TUPLE, co->co_nfreevars);
		}

		/* If flag 0x20 is set, we want to bind func_locals
		to the current locals at runtime.
		Push them on the stack in the right spot.
		*/
		if (flags & 0x20) {
		ADDOP(c, loc, LOAD_LOCALS);
		}

		ADDOP_LOAD_CONST(c, loc, (PyObject*)co);
		ADDOP_I(c, loc, MAKE_FUNCTION, flags);
		return SUCCESS;
Expand Down