Issue #22570: Renamed Py_SETREF to Py_XSETREF.

This commit is contained in:
Serhiy Storchaka 2016-04-06 09:50:03 +03:00
commit ec39756960
50 changed files with 174 additions and 174 deletions

View file

@ -730,7 +730,7 @@ setup_context(Py_ssize_t stack_level, PyObject **filename, int *lineno,
goto handle_error;
}
else if (!is_true) {
Py_SETREF(*filename, PyUnicode_FromString("__main__"));
Py_XSETREF(*filename, PyUnicode_FromString("__main__"));
if (*filename == NULL)
goto handle_error;
}

View file

@ -3236,7 +3236,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
Py_INCREF(self);
func = PyMethod_GET_FUNCTION(func);
Py_INCREF(func);
Py_SETREF(*pfunc, self);
Py_XSETREF(*pfunc, self);
na++;
/* n++; */
} else
@ -4491,7 +4491,7 @@ _PyEval_SetCoroutineWrapper(PyObject *wrapper)
PyThreadState *tstate = PyThreadState_GET();
Py_XINCREF(wrapper);
Py_SETREF(tstate->coroutine_wrapper, wrapper);
Py_XSETREF(tstate->coroutine_wrapper, wrapper);
}
PyObject *
@ -4747,7 +4747,7 @@ call_function(PyObject ***pp_stack, int oparg
Py_INCREF(self);
func = PyMethod_GET_FUNCTION(func);
Py_INCREF(func);
Py_SETREF(*pfunc, self);
Py_XSETREF(*pfunc, self);
na++;
n++;
} else

View file

@ -1756,7 +1756,7 @@ compiler_class(struct compiler *c, stmt_ty s)
{
/* use the class name for name mangling */
Py_INCREF(s->v.ClassDef.name);
Py_SETREF(c->u->u_private, s->v.ClassDef.name);
Py_XSETREF(c->u->u_private, s->v.ClassDef.name);
/* load (global) __name__ ... */
str = PyUnicode_InternFromString("__name__");
if (!str || !compiler_nameop(c, str, Load)) {

View file

@ -311,9 +311,9 @@ finally:
--tstate->recursion_depth;
/* throw away the old exception and use the recursion error instead */
Py_INCREF(PyExc_RecursionError);
Py_SETREF(*exc, PyExc_RecursionError);
Py_XSETREF(*exc, PyExc_RecursionError);
Py_INCREF(PyExc_RecursionErrorInst);
Py_SETREF(*val, PyExc_RecursionErrorInst);
Py_XSETREF(*val, PyExc_RecursionErrorInst);
/* just keeping the old traceback */
return;
}

View file

@ -884,7 +884,7 @@ update_code_filenames(PyCodeObject *co, PyObject *oldname, PyObject *newname)
return;
Py_INCREF(newname);
Py_SETREF(co->co_filename, newname);
Py_XSETREF(co->co_filename, newname);
constants = co->co_consts;
n = PyTuple_GET_SIZE(constants);
@ -1330,7 +1330,7 @@ remove_importlib_frames(void)
PyUnicode_CompareWithASCIIString(code->co_name,
remove_frames) == 0)) {
Py_XINCREF(next);
Py_SETREF(*outer_link, next);
Py_XSETREF(*outer_link, next);
prev_link = outer_link;
}
else {

View file

@ -118,7 +118,7 @@ tuple_of_constants(unsigned char *codestr, Py_ssize_t n,
/* If it's a BUILD_SET, use the PyTuple we just built to create a
PyFrozenSet, and use that as the constant instead: */
if (codestr[0] == BUILD_SET) {
Py_SETREF(newconst, PyFrozenSet_New(newconst));
Py_XSETREF(newconst, PyFrozenSet_New(newconst));
if (newconst == NULL)
return 0;
}

View file

@ -436,7 +436,7 @@ trace_trampoline(PyObject *self, PyFrameObject *frame,
return -1;
}
if (result != Py_None) {
Py_SETREF(frame->f_trace, result);
Py_XSETREF(frame->f_trace, result);
}
else {
Py_DECREF(result);