Skip to content

Commit 05618aa

Browse files
NekoAsakuraNekoAsakura
committed
pythongh-148871: make LOAD_COMMON_CONSTANT use immortal stackref borrows
1 parent 46a2c11 commit 05618aa

10 files changed

Lines changed: 72 additions & 41 deletions

File tree

‎Include/internal/pycore_interp_structs.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1001,7 +1001,7 @@ struct _is {
10011001
struct ast_state ast;
10021002
struct types_state types;
10031003
struct callable_cache callable_cache;
1004-
PyObject *common_consts[NUM_COMMON_CONSTANTS];
1004+
_PyStackRef common_consts[NUM_COMMON_CONSTANTS];
10051005
bool jit;
10061006
bool compiling;
10071007

‎Modules/_testinternalcapi/test_cases.c.h‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Python/bytecodes.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1972,7 +1972,7 @@ dummy_func(
19721972
inst(LOAD_COMMON_CONSTANT, ( -- value)) {
19731973
// Keep in sync with _common_constants in opcode.py
19741974
assert(oparg < NUM_COMMON_CONSTANTS);
1975-
value = PyStackRef_FromPyObjectNew(tstate->interp->common_consts[oparg]);
1975+
value = PyStackRef_DUP(tstate->interp->common_consts[oparg]);
19761976
}
19771977

19781978
inst(LOAD_BUILD_CLASS, ( -- bc)) {

‎Python/executor_cases.c.h‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Python/flowgraph.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include "pycore_opcode_utils.h"
1212
#include "pycore_opcode_metadata.h" // OPCODE_HAS_ARG, etc
1313
#include "pycore_pystate.h" // _PyInterpreterState_GET()
14+
#include "pycore_stackref.h" // PyStackRef_AsPyObjectBorrow()
1415

1516
#include <stdbool.h>
1617

@@ -1330,7 +1331,8 @@ get_const_value(int opcode, int oparg, PyObject *co_consts)
13301331
}
13311332
if (opcode == LOAD_COMMON_CONSTANT) {
13321333
assert(oparg < NUM_COMMON_CONSTANTS);
1333-
return Py_NewRef(_PyInterpreterState_GET()->common_consts[oparg]);
1334+
return Py_NewRef(PyStackRef_AsPyObjectBorrow(
1335+
_PyInterpreterState_GET()->common_consts[oparg]));
13341336
}
13351337

13361338
if (constant == NULL) {

‎Python/generated_cases.c.h‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Python/optimizer_bytecodes.c‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#include "pycore_long.h"
33
#include "pycore_opcode_utils.h"
44
#include "pycore_optimizer.h"
5+
#include "pycore_stackref.h"
56
#include "pycore_typeobject.h"
67
#include "pycore_uops.h"
78
#include "pycore_uop_ids.h"
@@ -870,15 +871,11 @@ dummy_func(void) {
870871

871872
op(_LOAD_COMMON_CONSTANT, (-- value)) {
872873
assert(oparg < NUM_COMMON_CONSTANTS);
873-
PyObject *val = _PyInterpreterState_GET()->common_consts[oparg];
874-
if (_Py_IsImmortal(val)) {
875-
ADD_OP(_LOAD_CONST_INLINE_BORROW, 0, (uintptr_t)val);
876-
value = PyJitRef_Borrow(sym_new_const(ctx, val));
877-
}
878-
else {
879-
ADD_OP(_LOAD_CONST_INLINE, 0, (uintptr_t)val);
880-
value = sym_new_const(ctx, val);
881-
}
874+
PyObject *val = PyStackRef_AsPyObjectBorrow(
875+
_PyInterpreterState_GET()->common_consts[oparg]);
876+
assert(_Py_IsImmortal(val));
877+
ADD_OP(_LOAD_CONST_INLINE_BORROW, 0, (uintptr_t)val);
878+
value = PyJitRef_Borrow(sym_new_const(ctx, val));
882879
}
883880

884881
op(_LOAD_SMALL_INT, (-- value)) {

‎Python/optimizer_cases.c.h‎

Lines changed: 5 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Python/pylifecycle.c‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#include "pycore_runtime.h" // _Py_ID()
2929
#include "pycore_runtime_init.h" // _PyRuntimeState_INIT
3030
#include "pycore_setobject.h" // _PySet_NextEntry()
31+
#include "pycore_stackref.h" // PyStackRef_FromPyObjectBorrow()
3132
#include "pycore_stats.h" // _PyStats_InterpInit()
3233
#include "pycore_sysmodule.h" // _PySys_ClearAttrString()
3334
#include "pycore_traceback.h" // PyUnstable_TracebackThreads()
@@ -878,22 +879,25 @@ pycore_init_builtins(PyThreadState *tstate)
878879
goto error;
879880
}
880881

881-
interp->common_consts[CONSTANT_ASSERTIONERROR] = PyExc_AssertionError;
882-
interp->common_consts[CONSTANT_NOTIMPLEMENTEDERROR] = PyExc_NotImplementedError;
883-
interp->common_consts[CONSTANT_BUILTIN_TUPLE] = (PyObject *)&PyTuple_Type;
884-
interp->common_consts[CONSTANT_BUILTIN_ALL] = all;
885-
interp->common_consts[CONSTANT_BUILTIN_ANY] = any;
886-
interp->common_consts[CONSTANT_BUILTIN_LIST] = (PyObject *)&PyList_Type;
887-
interp->common_consts[CONSTANT_BUILTIN_SET] = (PyObject *)&PySet_Type;
888-
interp->common_consts[CONSTANT_NONE] = Py_None;
889-
interp->common_consts[CONSTANT_EMPTY_STR] =
882+
PyObject *common_objs[NUM_COMMON_CONSTANTS] = {NULL};
883+
common_objs[CONSTANT_ASSERTIONERROR] = PyExc_AssertionError;
884+
common_objs[CONSTANT_NOTIMPLEMENTEDERROR] = PyExc_NotImplementedError;
885+
common_objs[CONSTANT_BUILTIN_TUPLE] = (PyObject *)&PyTuple_Type;
886+
common_objs[CONSTANT_BUILTIN_ALL] = all;
887+
common_objs[CONSTANT_BUILTIN_ANY] = any;
888+
common_objs[CONSTANT_BUILTIN_LIST] = (PyObject *)&PyList_Type;
889+
common_objs[CONSTANT_BUILTIN_SET] = (PyObject *)&PySet_Type;
890+
common_objs[CONSTANT_NONE] = Py_None;
891+
common_objs[CONSTANT_EMPTY_STR] =
890892
Py_GetConstantBorrowed(Py_CONSTANT_EMPTY_STR);
891-
interp->common_consts[CONSTANT_TRUE] = Py_True;
892-
interp->common_consts[CONSTANT_FALSE] = Py_False;
893-
interp->common_consts[CONSTANT_MINUS_ONE] =
893+
common_objs[CONSTANT_TRUE] = Py_True;
894+
common_objs[CONSTANT_FALSE] = Py_False;
895+
common_objs[CONSTANT_MINUS_ONE] =
894896
(PyObject *)&_PyLong_SMALL_INTS[_PY_NSMALLNEGINTS - 1];
895897
for (int i = 0; i < NUM_COMMON_CONSTANTS; i++) {
896-
assert(interp->common_consts[i] != NULL);
898+
assert(common_objs[i] != NULL);
899+
_Py_SetImmortal(common_objs[i]);
900+
interp->common_consts[i] = PyStackRef_FromPyObjectBorrow(common_objs[i]);
897901
}
898902

899903
PyObject *list_append = _PyType_Lookup(&PyList_Type, &_Py_ID(append));

‎Python/pystate.c‎

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,17 @@
1212
#include "pycore_freelist.h" // _PyObject_ClearFreeLists()
1313
#include "pycore_initconfig.h" // _PyStatus_OK()
1414
#include "pycore_interpframe.h" // _PyThreadState_HasStackSpace()
15-
#include "pycore_object.h" // _PyType_InitCache()
15+
#include "pycore_object.h" // _PyType_InitCache(), _Py_ClearImmortal()
1616
#include "pycore_obmalloc.h" // _PyMem_obmalloc_state_on_heap()
17+
#include "pycore_opcode_utils.h" // NUM_COMMON_CONSTANTS
1718
#include "pycore_optimizer.h" // JIT_CLEANUP_THRESHOLD
1819
#include "pycore_parking_lot.h" // _PyParkingLot_AfterFork()
1920
#include "pycore_pyerrors.h" // _PyErr_Clear()
2021
#include "pycore_pylifecycle.h" // _PyAST_Fini()
2122
#include "pycore_pymem.h" // _PyMem_DebugEnabled()
2223
#include "pycore_runtime.h" // _PyRuntime
2324
#include "pycore_runtime_init.h" // _PyRuntimeState_INIT
24-
#include "pycore_stackref.h" // Py_STACKREF_DEBUG
25+
#include "pycore_stackref.h" // PyStackRef_AsPyObjectBorrow()
2526
#include "pycore_stats.h" // FT_STAT_WORLD_STOP_INC()
2627
#include "pycore_time.h" // _PyTime_Init()
2728
#include "pycore_uniqueid.h" // _PyObject_FinalizePerThreadRefcounts()
@@ -777,6 +778,36 @@ extern void
777778
_Py_stackref_report_leaks(PyInterpreterState *interp);
778779
#endif
779780

781+
static int
782+
common_const_is_initialized(_PyStackRef ref)
783+
{
784+
#if !defined(Py_GIL_DISABLED) && defined(Py_STACKREF_DEBUG)
785+
return !PyStackRef_IsNull(ref);
786+
#else
787+
return ref.bits != 0 && !PyStackRef_IsNull(ref);
788+
#endif
789+
}
790+
791+
792+
static void
793+
common_constants_clear(PyInterpreterState *interp)
794+
{
795+
for (int i = 0; i < NUM_COMMON_CONSTANTS; i++) {
796+
_PyStackRef ref = interp->common_consts[i];
797+
if (!common_const_is_initialized(ref)) {
798+
continue;
799+
}
800+
PyObject *obj = PyStackRef_AsPyObjectBorrow(ref);
801+
PyStackRef_XCLOSE(ref);
802+
interp->common_consts[i] = PyStackRef_NULL;
803+
// Refcount reclamation skips heap immortals; release manually.
804+
if (_Py_IsImmortal(obj) && !_Py_IsStaticImmortal(obj)) {
805+
_Py_ClearImmortal(obj);
806+
}
807+
}
808+
}
809+
810+
780811
static void
781812
interpreter_clear(PyInterpreterState *interp, PyThreadState *tstate)
782813
{
@@ -903,6 +934,7 @@ interpreter_clear(PyInterpreterState *interp, PyThreadState *tstate)
903934
PyDict_Clear(interp->builtins);
904935
Py_CLEAR(interp->sysdict);
905936
Py_CLEAR(interp->builtins);
937+
common_constants_clear(interp);
906938

907939
#if !defined(Py_GIL_DISABLED) && defined(Py_STACKREF_DEBUG)
908940
# ifdef Py_STACKREF_CLOSE_DEBUG

0 commit comments

Comments
 (0)