Do not attempt to normalize if no exception occurred

superbobry · superbobry · commit e289e0ea24c2 · 2019-08-28T11:30:55.000+01:00
This is not supported on PyPy-2.7 5.8.0.
diff --git a/include/pybind11/pytypes.h b/include/pybind11/pytypes.h
@@ -335,7 +335,8 @@ class error_already_set : public std::exception {
 
     virtual const char* what() const noexcept {
         if (m_lazy_what.empty()) {
-            PyErr_NormalizeException(&m_type.ptr(), &m_value.ptr(), &m_trace.ptr());
+            if (m_type || m_value || m_trace)
+               PyErr_NormalizeException(&m_type.ptr(), &m_value.ptr(), &m_trace.ptr());
             m_lazy_what = detail::error_string(m_type.ptr(), m_value.ptr(), m_trace.ptr());
         }
         return m_lazy_what.c_str();

Original file line number	Diff line number	Diff line change
`@@ -335,7 +335,8 @@ class error_already_set : public std::exception {`
`335`	`335`
`336`	`336`	`virtual const char* what() const noexcept {`
`337`	`337`	`if (m_lazy_what.empty()) {`
`338`		`- PyErr_NormalizeException(&m_type.ptr(), &m_value.ptr(), &m_trace.ptr());`
	`338`	`+ if (m_type \|\| m_value \|\| m_trace)`
	`339`	`+ PyErr_NormalizeException(&m_type.ptr(), &m_value.ptr(), &m_trace.ptr());`
`339`	`340`	`m_lazy_what = detail::error_string(m_type.ptr(), m_value.ptr(), m_trace.ptr());`
`340`	`341`	`}`
`341`	`342`	`return m_lazy_what.c_str();`