mirror of
https://github.com/python/cpython.git
synced 2025-08-04 00:48:58 +00:00
gh-99300: Use Py_NewRef() in Python/ceval.c (#99318)
Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/ceval.c and related files.
This commit is contained in:
Victor Stinner
GitHub
parent
231d83b724
commit
2e343fc465
3 changed files with 68 additions and 128 deletions
|
|
@ -941,10 +941,9 @@ dummy_func(
|
|||
PUSH(value);
|
||||
DISPATCH();
|
||||
}
|
||||
Py_INCREF(exc_value);
|
||||
PyObject *exc_type = Py_NewRef(Py_TYPE(exc_value));
|
||||
PyObject *exc_traceback = PyException_GetTraceback(exc_value);
|
||||
_PyErr_Restore(tstate, exc_type, exc_value, exc_traceback);
|
||||
_PyErr_Restore(tstate, exc_type, Py_NewRef(exc_value), exc_traceback);
|
||||
goto exception_unwind;
|
||||
}
|
||||
|
||||
|
|
@ -982,8 +981,8 @@ dummy_func(
|
|||
}
|
||||
assert(PyExceptionInstance_Check(error));
|
||||
SET_TOP(error);
|
||||
PyException_SetCause(error, exc);
|
||||
Py_INCREF(exc);
|
||||
PyException_SetCause(error, Py_NewRef(exc));
|
||||
// Steal exc reference, rather than Py_NewRef+Py_DECREF
|
||||
PyException_SetContext(error, exc);
|
||||
Py_DECREF(message);
|
||||
}
|
||||
|
|
@ -994,8 +993,7 @@ dummy_func(
|
|||
// stack effect: ( -- __0)
|
||||
inst(LOAD_ASSERTION_ERROR) {
|
||||
PyObject *value = PyExc_AssertionError;
|
||||
Py_INCREF(value);
|
||||
PUSH(value);
|
||||
PUSH(Py_NewRef(value));
|
||||
}
|
||||
|
||||
// stack effect: ( -- __0)
|
||||
|
|
@ -1351,8 +1349,7 @@ dummy_func(
|
|||
JUMPBY(INLINE_CACHE_ENTRIES_LOAD_GLOBAL);
|
||||
STAT_INC(LOAD_GLOBAL, hit);
|
||||
STACK_GROW(push_null+1);
|
||||
Py_INCREF(res);
|
||||
SET_TOP(res);
|
||||
SET_TOP(Py_NewRef(res));
|
||||
}
|
||||
|
||||
// error: LOAD_GLOBAL has irregular stack effect
|
||||
|
|
@ -1376,8 +1373,7 @@ dummy_func(
|
|||
JUMPBY(INLINE_CACHE_ENTRIES_LOAD_GLOBAL);
|
||||
STAT_INC(LOAD_GLOBAL, hit);
|
||||
STACK_GROW(push_null+1);
|
||||
Py_INCREF(res);
|
||||
SET_TOP(res);
|
||||
SET_TOP(Py_NewRef(res));
|
||||
}
|
||||
|
||||
// stack effect: ( -- )
|
||||
|
|
@ -1459,8 +1455,7 @@ dummy_func(
|
|||
format_exc_unbound(tstate, frame->f_code, oparg);
|
||||
goto error;
|
||||
}
|
||||
Py_INCREF(value);
|
||||
PUSH(value);
|
||||
PUSH(Py_NewRef(value));
|
||||
}
|
||||
|
||||
// stack effect: (__0 -- )
|
||||
|
|
@ -1482,8 +1477,7 @@ dummy_func(
|
|||
assert(oparg == co->co_nfreevars);
|
||||
for (int i = 0; i < oparg; ++i) {
|
||||
PyObject *o = PyTuple_GET_ITEM(closure, i);
|
||||
Py_INCREF(o);
|
||||
frame->localsplus[offset + i] = o;
|
||||
frame->localsplus[offset + i] = Py_NewRef(o);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1987,9 +1981,8 @@ dummy_func(
|
|||
SET_TOP(NULL);
|
||||
int shrink_stack = !(oparg & 1);
|
||||
STACK_SHRINK(shrink_stack);
|
||||
Py_INCREF(name);
|
||||
new_frame->localsplus[0] = owner;
|
||||
new_frame->localsplus[1] = name;
|
||||
new_frame->localsplus[1] = Py_NewRef(name);
|
||||
for (int i = 2; i < code->co_nlocalsplus; i++) {
|
||||
new_frame->localsplus[i] = NULL;
|
||||
}
|
||||
|
|
@ -2233,8 +2226,7 @@ dummy_func(
|
|||
PyObject *left = TOP();
|
||||
int res = Py_Is(left, right) ^ oparg;
|
||||
PyObject *b = res ? Py_True : Py_False;
|
||||
Py_INCREF(b);
|
||||
SET_TOP(b);
|
||||
SET_TOP(Py_NewRef(b));
|
||||
Py_DECREF(left);
|
||||
Py_DECREF(right);
|
||||
}
|
||||
|
|
@ -2250,8 +2242,7 @@ dummy_func(
|
|||
goto error;
|
||||
}
|
||||
PyObject *b = (res^oparg) ? Py_True : Py_False;
|
||||
Py_INCREF(b);
|
||||
PUSH(b);
|
||||
PUSH(Py_NewRef(b));
|
||||
}
|
||||
|
||||
// stack effect: ( -- )
|
||||
|
|
@ -2532,8 +2523,7 @@ dummy_func(
|
|||
}
|
||||
else {
|
||||
// Failure!
|
||||
Py_INCREF(Py_None);
|
||||
SET_TOP(Py_None);
|
||||
SET_TOP(Py_NewRef(Py_None));
|
||||
}
|
||||
Py_DECREF(subject);
|
||||
}
|
||||
|
|
@ -2543,8 +2533,7 @@ dummy_func(
|
|||
PyObject *subject = TOP();
|
||||
int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_MAPPING;
|
||||
PyObject *res = match ? Py_True : Py_False;
|
||||
Py_INCREF(res);
|
||||
PUSH(res);
|
||||
PUSH(Py_NewRef(res));
|
||||
PREDICT(POP_JUMP_IF_FALSE);
|
||||
}
|
||||
|
||||
|
|
@ -2553,8 +2542,7 @@ dummy_func(
|
|||
PyObject *subject = TOP();
|
||||
int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_SEQUENCE;
|
||||
PyObject *res = match ? Py_True : Py_False;
|
||||
Py_INCREF(res);
|
||||
PUSH(res);
|
||||
PUSH(Py_NewRef(res));
|
||||
PREDICT(POP_JUMP_IF_FALSE);
|
||||
}
|
||||
|
||||
|
|
@ -2656,8 +2644,7 @@ dummy_func(
|
|||
if (seq) {
|
||||
if (it->it_index < PyList_GET_SIZE(seq)) {
|
||||
PyObject *next = PyList_GET_ITEM(seq, it->it_index++);
|
||||
Py_INCREF(next);
|
||||
PUSH(next);
|
||||
PUSH(Py_NewRef(next));
|
||||
JUMPBY(INLINE_CACHE_ENTRIES_FOR_ITER);
|
||||
DISPATCH();
|
||||
}
|
||||
|
|
@ -2704,8 +2691,7 @@ dummy_func(
|
|||
JUMPBY(INLINE_CACHE_ENTRIES_FOR_ITER + oparg);
|
||||
assert(_Py_OPCODE(*next_instr) == END_FOR);
|
||||
frame->prev_instr = next_instr - 1;
|
||||
Py_INCREF(Py_None);
|
||||
_PyFrame_StackPush(gen_frame, Py_None);
|
||||
_PyFrame_StackPush(gen_frame, Py_NewRef(Py_None));
|
||||
gen->gi_frame_state = FRAME_EXECUTING;
|
||||
gen->gi_exc_state.previous_item = tstate->exc_info;
|
||||
tstate->exc_info = &gen->gi_exc_state;
|
||||
|
|
@ -2826,12 +2812,10 @@ dummy_func(
|
|||
SET_TOP(exc_info->exc_value);
|
||||
}
|
||||
else {
|
||||
Py_INCREF(Py_None);
|
||||
SET_TOP(Py_None);
|
||||
SET_TOP(Py_NewRef(Py_None));
|
||||
}
|
||||
|
||||
Py_INCREF(value);
|
||||
PUSH(value);
|
||||
PUSH(Py_NewRef(value));
|
||||
assert(PyExceptionInstance_Check(value));
|
||||
exc_info->exc_value = value;
|
||||
|
||||
|
|
@ -2857,8 +2841,7 @@ dummy_func(
|
|||
PyObject *res = read_obj(cache->descr);
|
||||
assert(res != NULL);
|
||||
assert(_PyType_HasFeature(Py_TYPE(res), Py_TPFLAGS_METHOD_DESCRIPTOR));
|
||||
Py_INCREF(res);
|
||||
SET_TOP(res);
|
||||
SET_TOP(Py_NewRef(res));
|
||||
PUSH(self);
|
||||
JUMPBY(INLINE_CACHE_ENTRIES_LOAD_ATTR);
|
||||
}
|
||||
|
|
@ -2885,8 +2868,7 @@ dummy_func(
|
|||
PyObject *res = read_obj(cache->descr);
|
||||
assert(res != NULL);
|
||||
assert(_PyType_HasFeature(Py_TYPE(res), Py_TPFLAGS_METHOD_DESCRIPTOR));
|
||||
Py_INCREF(res);
|
||||
SET_TOP(res);
|
||||
SET_TOP(Py_NewRef(res));
|
||||
PUSH(self);
|
||||
JUMPBY(INLINE_CACHE_ENTRIES_LOAD_ATTR);
|
||||
}
|
||||
|
|
@ -2904,8 +2886,7 @@ dummy_func(
|
|||
PyObject *res = read_obj(cache->descr);
|
||||
assert(res != NULL);
|
||||
assert(_PyType_HasFeature(Py_TYPE(res), Py_TPFLAGS_METHOD_DESCRIPTOR));
|
||||
Py_INCREF(res);
|
||||
SET_TOP(res);
|
||||
SET_TOP(Py_NewRef(res));
|
||||
PUSH(self);
|
||||
JUMPBY(INLINE_CACHE_ENTRIES_LOAD_ATTR);
|
||||
}
|
||||
|
|
@ -2927,8 +2908,7 @@ dummy_func(
|
|||
PyObject *res = read_obj(cache->descr);
|
||||
assert(res != NULL);
|
||||
assert(_PyType_HasFeature(Py_TYPE(res), Py_TPFLAGS_METHOD_DESCRIPTOR));
|
||||
Py_INCREF(res);
|
||||
SET_TOP(res);
|
||||
SET_TOP(Py_NewRef(res));
|
||||
PUSH(self);
|
||||
JUMPBY(INLINE_CACHE_ENTRIES_LOAD_ATTR);
|
||||
}
|
||||
|
|
@ -2939,12 +2919,10 @@ dummy_func(
|
|||
PyObject *function = PEEK(oparg + 1);
|
||||
DEOPT_IF(Py_TYPE(function) != &PyMethod_Type, CALL);
|
||||
STAT_INC(CALL, hit);
|
||||
PyObject *meth = ((PyMethodObject *)function)->im_func;
|
||||
PyObject *self = ((PyMethodObject *)function)->im_self;
|
||||
Py_INCREF(meth);
|
||||
Py_INCREF(self);
|
||||
PEEK(oparg + 1) = self;
|
||||
PEEK(oparg + 2) = meth;
|
||||
PEEK(oparg + 1) = Py_NewRef(self);
|
||||
PyObject *meth = ((PyMethodObject *)function)->im_func;
|
||||
PEEK(oparg + 2) = Py_NewRef(meth);
|
||||
Py_DECREF(function);
|
||||
GO_TO_INSTRUCTION(CALL_PY_EXACT_ARGS);
|
||||
}
|
||||
|
|
@ -2974,12 +2952,10 @@ dummy_func(
|
|||
is_meth = is_method(stack_pointer, oparg);
|
||||
PyObject *function = PEEK(oparg + 1);
|
||||
if (!is_meth && Py_TYPE(function) == &PyMethod_Type) {
|
||||
PyObject *meth = ((PyMethodObject *)function)->im_func;
|
||||
PyObject *self = ((PyMethodObject *)function)->im_self;
|
||||
Py_INCREF(meth);
|
||||
Py_INCREF(self);
|
||||
PEEK(oparg+1) = self;
|
||||
PEEK(oparg+2) = meth;
|
||||
PEEK(oparg+1) = Py_NewRef(self);
|
||||
PyObject *meth = ((PyMethodObject *)function)->im_func;
|
||||
PEEK(oparg+2) = Py_NewRef(meth);
|
||||
Py_DECREF(function);
|
||||
is_meth = 1;
|
||||
}
|
||||
|
|
@ -3102,8 +3078,7 @@ dummy_func(
|
|||
for (int i = argcount; i < code->co_argcount; i++) {
|
||||
PyObject *def = PyTuple_GET_ITEM(func->func_defaults,
|
||||
i - minargs);
|
||||
Py_INCREF(def);
|
||||
new_frame->localsplus[i] = def;
|
||||
new_frame->localsplus[i] = Py_NewRef(def);
|
||||
}
|
||||
for (int i = code->co_argcount; i < code->co_nlocalsplus; i++) {
|
||||
new_frame->localsplus[i] = NULL;
|
||||
|
|
@ -3734,8 +3709,7 @@ dummy_func(
|
|||
inst(COPY) {
|
||||
assert(oparg != 0);
|
||||
PyObject *peek = PEEK(oparg);
|
||||
Py_INCREF(peek);
|
||||
PUSH(peek);
|
||||
PUSH(Py_NewRef(peek));
|
||||
}
|
||||
|
||||
// stack effect: (__0 -- )
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue