Avoid an additional utility code section for 2-exception matching by relying...

Avoid an additional utility code section for 2-exception matching by relying on existing special-cased macros.

Cython/Compiler/Nodes.py

@@ -7724,7 +7724,7 @@ class ExceptClauseNode(Node):
                     )
             elif len(patterns) == 2:
                 code.globalstate.use_utility_code(
-                    UtilityCode.load_cached("PyErrExceptionMatches2", "Exceptions.c"))
+                    UtilityCode.load_cached("FastTypeChecks", "ModuleSetupCode.c"))
                 exc_tests.append("__Pyx_PyErr_ExceptionMatches2(%s, %s)" % (
                     patterns[0], patterns[1],
                 ))

Cython/Utility/Exceptions.c

@@ -20,17 +20,6 @@
 #endif
 
 
-/////////////// PyErrExceptionMatches2.proto ///////////////
-//@substitute: naming
-//@requires: ModuleSetupCode.c::FastTypeChecks
-
-#if CYTHON_FAST_THREAD_STATE
-#define __Pyx_PyErr_ExceptionMatches2(err1, err2) __Pyx_PyErr_ExceptionMatchesInState2($local_tstate_cname, err1, err2)
-#define __Pyx_PyErr_ExceptionMatchesInState2(tstate, err1, err2)  __Pyx_PyErr_GivenExceptionMatches2((tstate)->curexc_type, err1, err2)
-#else
-#define __Pyx_PyErr_ExceptionMatches2(err1, err2)  __Pyx_PyErr_GivenExceptionMatches2(PyErr_Occurred(), err1, err2)
-#endif
-
 /////////////// PyErrExceptionMatches.proto ///////////////
 //@substitute: naming
 

Cython/Utility/ModuleSetupCode.c

@@ -936,6 +936,7 @@ static CYTHON_INLINE int __Pyx_PyErr_GivenExceptionMatches2(PyObject *err, PyObj
 #define __Pyx_PyErr_GivenExceptionMatches(err, type) PyErr_GivenExceptionMatches(err, type)
 #define __Pyx_PyErr_GivenExceptionMatches2(err, type1, type2) (PyErr_GivenExceptionMatches(err, type1) || PyErr_GivenExceptionMatches(err, type2))
 #endif
+#define __Pyx_PyErr_ExceptionMatches2(err1, err2)  __Pyx_PyErr_GivenExceptionMatches2(__Pyx_PyErr_Occurred(), err1, err2)
 
 #define __Pyx_PyException_Check(obj) __Pyx_TypeCheck(obj, PyExc_Exception)