Further small simplification. With the GIL held, simply deleting the raw_ptr takes care of everything.

rwgk · rwgk · commit 53e29f419efd · 2022-06-02T01:01:44.000-07:00
diff --git a/include/pybind11/pybind11.h b/include/pybind11/pybind11.h
@@ -2629,7 +2629,6 @@ inline void
 error_already_set::m_fetched_error_deleter(detail::error_fetch_and_normalize *raw_ptr) {
     gil_scoped_acquire gil;
     error_scope scope;
-    raw_ptr->release_py_object_references();
     delete raw_ptr;
 }
 
diff --git a/include/pybind11/pytypes.h b/include/pybind11/pytypes.h
@@ -541,12 +541,6 @@ struct error_fetch_and_normalize {
         return (PyErr_GivenExceptionMatches(m_type.ptr(), exc.ptr()) != 0);
     }
 
-    void release_py_object_references() {
-        m_type.release().dec_ref();
-        m_value.release().dec_ref();
-        m_trace.release().dec_ref();
-    }
-
     // Not protecting these for simplicity.
     object m_type, m_value, m_trace;
 

Original file line number	Diff line number	Diff line change
`@@ -2629,7 +2629,6 @@ inline void`
`2629`	`2629`	`error_already_set::m_fetched_error_deleter(detail::error_fetch_and_normalize *raw_ptr) {`
`2630`	`2630`	`gil_scoped_acquire gil;`
`2631`	`2631`	`error_scope scope;`
`2632`		`- raw_ptr->release_py_object_references();`
`2633`	`2632`	`delete raw_ptr;`
`2634`	`2633`	`}`
`2635`	`2634`