Avoid upcall in _PyErr_Occurred

fangerer · fangerer · commit e2e961c33a9e · 2024-04-02T15:10:46.000+02:00
diff --git a/graalpython/com.oracle.graal.python.cext/include/internal/pycore_pyerrors.h b/graalpython/com.oracle.graal.python.cext/include/internal/pycore_pyerrors.h
@@ -24,8 +24,10 @@ extern void _PyErr_FiniTypes(PyInterpreterState *);
 
 static inline PyObject* _PyErr_Occurred(PyThreadState *tstate)
 {
+    assert(tstate != NULL);
     // GraalPy change
-    return PyErr_Occurred();
+    assert(tstate->curexc_type == _PyTruffleErr_Occurred(tstate));
+    return tstate->curexc_type;
 }
 
 static inline void _PyErr_ClearExcState(_PyErr_StackItem *exc_state)
diff --git a/graalpython/com.oracle.graal.python.cext/src/errors.c b/graalpython/com.oracle.graal.python.cext/src/errors.c
@@ -162,7 +162,6 @@ PyErr_SetString(PyObject *exception, const char *string)
 }
 
 
-#if 0 // GraalPy change
 PyObject* _Py_HOT_FUNCTION
 PyErr_Occurred(void)
 {
@@ -174,6 +173,7 @@ PyErr_Occurred(void)
 }
 
 
+#if 0 // GraalPy change
 int
 PyErr_GivenExceptionMatches(PyObject *err, PyObject *exc)
 {

Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,10 @@ extern void _PyErr_FiniTypes(PyInterpreterState *);`
`24`	`24`
`25`	`25`	`static inline PyObject* _PyErr_Occurred(PyThreadState *tstate)`
`26`	`26`	`{`
	`27`	`+ assert(tstate != NULL);`
`27`	`28`	`// GraalPy change`
`28`		`- return PyErr_Occurred();`
	`29`	`+ assert(tstate->curexc_type == _PyTruffleErr_Occurred(tstate));`
	`30`	`+ return tstate->curexc_type;`
`29`	`31`	`}`
`30`	`32`
`31`	`33`	`static inline void _PyErr_ClearExcState(_PyErr_StackItem *exc_state)`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,6 @@ PyErr_SetString(PyObject exception, const char string)`
`162`	`162`	`}`
`163`	`163`
`164`	`164`
`165`		`-#if 0 // GraalPy change`
`166`	`165`	`PyObject* _Py_HOT_FUNCTION`
`167`	`166`	`PyErr_Occurred(void)`
`168`	`167`	`{`
`@@ -174,6 +173,7 @@ PyErr_Occurred(void)`
`174`	`173`	`}`
`175`	`174`
`176`	`175`
	`176`	`+#if 0 // GraalPy change`
`177`	`177`	`int`
`178`	`178`	`PyErr_GivenExceptionMatches(PyObject err, PyObject exc)`
`179`	`179`	`{`