pythongh-102192: remove unused _PyErr_ChainExceptions

iritkatriel · iritkatriel · commit de98c0876e09 · 2023-03-22T20:42:41.000Z
diff --git a/Include/cpython/pyerrors.h b/Include/cpython/pyerrors.h
@@ -98,7 +98,6 @@ PyAPI_FUNC(void) _PyErr_GetExcInfo(PyThreadState *, PyObject **, PyObject **, Py
 
 /* Context manipulation (PEP 3134) */
 
-PyAPI_FUNC(void) _PyErr_ChainExceptions(PyObject *, PyObject *, PyObject *);
 PyAPI_FUNC(void) _PyErr_ChainExceptions1(PyObject *);
 
 /* Like PyErr_Format(), but saves current exception as __context__ and
diff --git a/Python/errors.c b/Python/errors.c
@@ -644,43 +644,6 @@ _PyErr_StackItemToExcInfoTuple(_PyErr_StackItem *err_info)
 }
 
 
-/* Like PyErr_Restore(), but if an exception is already set,
-   set the context associated with it.
-
-   The caller is responsible for ensuring that this call won't create
-   any cycles in the exception context chain. */
-void
-_PyErr_ChainExceptions(PyObject *typ, PyObject *val, PyObject *tb)
-{
-    if (typ == NULL)
-        return;
-
-    PyThreadState *tstate = _PyThreadState_GET();
-
-    if (!PyExceptionClass_Check(typ)) {
-        _PyErr_Format(tstate, PyExc_SystemError,
-                      "_PyErr_ChainExceptions: "
-                      "exception %R is not a BaseException subclass",
-                      typ);
-        return;
-    }
-
-    if (_PyErr_Occurred(tstate)) {
-        _PyErr_NormalizeException(tstate, &typ, &val, &tb);
-        if (tb != NULL) {
-            PyException_SetTraceback(val, tb);
-            Py_DECREF(tb);
-        }
-        Py_DECREF(typ);
-        PyObject *exc2 = _PyErr_GetRaisedException(tstate);
-        PyException_SetContext(exc2, val);
-        _PyErr_SetRaisedException(tstate, exc2);
-    }
-    else {
-        _PyErr_Restore(tstate, typ, val, tb);
-    }
-}
-
 /* Like PyErr_SetRaisedException(), but if an exception is already set,
    set the context associated with it.
 
