May 22, 2024 · May 21, 2024 · May 21, 2024 · May 21, 2024 · May 21, 2024 · May 21, 2024
diff --git a/Include/internal/pycore_compile.h b/Include/internal/pycore_compile.h
 PyAPI_FUNC(PyObject*) _PyCompile_GetUnaryIntrinsicName(int index);
 PyAPI_FUNC(PyObject*) _PyCompile_GetBinaryIntrinsicName(int index);
 PyAPI_FUNC(PyObject *) _PyCompile_GetCommonConstantsList(void);
 PyAPI_FUNC(void) _PyCompile_SetCommonConstant(int index, PyObject *constant);

 /* Access compiler internals for unit testing */

diff --git a/Python/bytecodes.c b/Python/bytecodes.c
        }

        inst(LOAD_COMMON_CONSTANT, ( -- value)) {
            value = Py_NewRef(*common_constants[oparg]);
            value = Py_NewRef(common_constants[oparg]);
        }

        inst(LOAD_BUILD_CLASS, ( -- bc)) {
diff --git a/Python/ceval.c b/Python/ceval.c
    _Py_LeaveRecursiveCall();
 }

 void
 _PyCompile_SetCommonConstant(int index, PyObject *constant)
 {
    assert(index >= 0 && index < NUM_COMMON_CONSTANTS);
    common_constants[index] = constant;
 }

 PyObject *
 _PyCompile_GetCommonConstantsList(void)
 {
        return NULL;
    }
    for (int i = 0; i < NUM_COMMON_CONSTANTS; i++) {
        PyList_SET_ITEM(lst, i, Py_NewRef(*common_constants[i]));
        PyList_SET_ITEM(lst, i, Py_NewRef(common_constants[i]));
    }
    return lst;
 }
diff --git a/Python/ceval_macros.h b/Python/ceval_macros.h
 #define EXIT_TO_TIER1() goto exit_to_tier1
 #define EXIT_TO_TIER1_DYNAMIC() goto exit_to_tier1_dynamic;

 static PyObject **common_constants[NUM_COMMON_CONSTANTS] = {
    [CONSTANT_ASSERTIONERROR] = &PyExc_AssertionError,
    [CONSTANT_NOTIMPLEMENTEDERROR] = &PyExc_NotImplementedError,
 };
 static PyObject *common_constants[NUM_COMMON_CONSTANTS];
diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
 #include "pycore_call.h"          // _PyObject_CallMethod()
 #include "pycore_ceval.h"         // _PyEval_FiniGIL()
 #include "pycore_codecs.h"        // _PyCodec_Lookup()
 #include "pycore_compile.h"       // _PyCompile_SetCommonConstant()
 #include "pycore_context.h"       // _PyContext_Init()
 #include "pycore_dict.h"          // _PyDict_Fini()
 #include "pycore_exceptions.h"    // _PyExc_InitTypes()
 #include "pycore_list.h"          // _PyList_Fini()
 #include "pycore_long.h"          // _PyLong_InitTypes()
 #include "pycore_object.h"        // _PyDebug_PrintTotalRefs()
 #include "pycore_opcode_utils.h"  // CONSTANT_ASSERTIONERROR etc.
 #include "pycore_pathconfig.h"    // _PyPathConfig_UpdateGlobal()
 #include "pycore_pyerrors.h"      // _PyErr_Occurred()
 #include "pycore_pylifecycle.h"   // _PyErr_Print()
    }
    Py_DECREF(bimod);

    _PyCompile_SetCommonConstant(CONSTANT_ASSERTIONERROR, PyExc_AssertionError);
    _PyCompile_SetCommonConstant(CONSTANT_NOTIMPLEMENTEDERROR, PyExc_NotImplementedError);

    if (_PyImport_InitDefaultImportFunc(interp) < 0) {
        goto error;
    }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -88,6 +88,7 @@ PyAPI_FUNC(int) _PyCompile_OpcodeHasExc(int opcode);
		PyAPI_FUNC(PyObject*) _PyCompile_GetUnaryIntrinsicName(int index);
		PyAPI_FUNC(PyObject*) _PyCompile_GetBinaryIntrinsicName(int index);
		PyAPI_FUNC(PyObject *) _PyCompile_GetCommonConstantsList(void);
		PyAPI_FUNC(void) _PyCompile_SetCommonConstant(int index, PyObject *constant);

		/* Access compiler internals for unit testing */

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1189,7 +1189,7 @@ dummy_func(
		}

		inst(LOAD_COMMON_CONSTANT, ( -- value)) {
		value = Py_NewRef(*common_constants[oparg]);
		value = Py_NewRef(common_constants[oparg]);
		}

		inst(LOAD_BUILD_CLASS, ( -- bc)) {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2991,6 +2991,13 @@ void Py_LeaveRecursiveCall(void)
		_Py_LeaveRecursiveCall();
		}

		void
		_PyCompile_SetCommonConstant(int index, PyObject *constant)
		{
		assert(index >= 0 && index < NUM_COMMON_CONSTANTS);
		common_constants[index] = constant;
		}

		PyObject *
		_PyCompile_GetCommonConstantsList(void)
JelleZijlstra marked this conversation as resolved. Show resolvedHide resolved
		{
Expand All		@@ -2999,7 +3006,7 @@ _PyCompile_GetCommonConstantsList(void)
		return NULL;
		}
		for (int i = 0; i < NUM_COMMON_CONSTANTS; i++) {
		PyList_SET_ITEM(lst, i, Py_NewRef(*common_constants[i]));
		PyList_SET_ITEM(lst, i, Py_NewRef(common_constants[i]));
		}
		return lst;
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -448,7 +448,4 @@ do { \
		#define EXIT_TO_TIER1() goto exit_to_tier1
		#define EXIT_TO_TIER1_DYNAMIC() goto exit_to_tier1_dynamic;

		static PyObject **common_constants[NUM_COMMON_CONSTANTS] = {
		[CONSTANT_ASSERTIONERROR] = &PyExc_AssertionError,
		[CONSTANT_NOTIMPLEMENTEDERROR] = &PyExc_NotImplementedError,
		};
		static PyObject *common_constants[NUM_COMMON_CONSTANTS];
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,6 +5,7 @@
		#include "pycore_call.h" // _PyObject_CallMethod()
		#include "pycore_ceval.h" // _PyEval_FiniGIL()
		#include "pycore_codecs.h" // _PyCodec_Lookup()
		#include "pycore_compile.h" // _PyCompile_SetCommonConstant()
		#include "pycore_context.h" // _PyContext_Init()
		#include "pycore_dict.h" // _PyDict_Fini()
		#include "pycore_exceptions.h" // _PyExc_InitTypes()
Expand All		@@ -17,6 +18,7 @@
		#include "pycore_list.h" // _PyList_Fini()
		#include "pycore_long.h" // _PyLong_InitTypes()
		#include "pycore_object.h" // _PyDebug_PrintTotalRefs()
		#include "pycore_opcode_utils.h" // CONSTANT_ASSERTIONERROR etc.
		#include "pycore_pathconfig.h" // _PyPathConfig_UpdateGlobal()
		#include "pycore_pyerrors.h" // _PyErr_Occurred()
		#include "pycore_pylifecycle.h" // _PyErr_Print()
Expand DownExpand Up		@@ -826,6 +828,9 @@ pycore_init_builtins(PyThreadState *tstate)
		}
		Py_DECREF(bimod);

		_PyCompile_SetCommonConstant(CONSTANT_ASSERTIONERROR, PyExc_AssertionError);
		_PyCompile_SetCommonConstant(CONSTANT_NOTIMPLEMENTEDERROR, PyExc_NotImplementedError);

		if (_PyImport_InitDefaultImportFunc(interp) < 0) {
		goto error;
		}
Expand Down