fix: missing include

Author: henryiii

include/pybind11/detail/internals.h

@@ -11,6 +11,8 @@
 
 #include "../pytypes.h"
 
+#include <exception>
+
 PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
 PYBIND11_NAMESPACE_BEGIN(detail)
 // Forward declarations
@@ -100,9 +102,7 @@ struct internals {
     std::unordered_set<std::pair<const PyObject *, const char *>, overload_hash> inactive_overload_cache;
     type_map<std::vector<bool (*)(PyObject *, void *&)>> direct_conversions;
     std::unordered_map<const PyObject *, std::vector<PyObject *>> patients;
-#if !defined (__PGIC__)
     std::forward_list<void (*) (std::exception_ptr)> registered_exception_translators;
-#endif
     std::unordered_map<std::string, void *> shared_data; // Custom data to be shared across extensions
     std::vector<PyObject *> loader_patient_stack; // Used by `loader_life_support`
     std::forward_list<std::string> static_strings; // Stores the std::strings backing detail::c_str()
@@ -214,7 +214,6 @@ inline internals **&get_internals_pp() {
     return internals_pp;
 }
 
-#if !defined (__PGIC__)
 inline void translate_exception(std::exception_ptr p) {
     try {
         if (p) std::rethrow_exception(p);
@@ -233,7 +232,6 @@ inline void translate_exception(std::exception_ptr p) {
         return;
     }
 }
-#endif
 
 #if !defined(__GLIBCXX__)
 inline void translate_local_exception(std::exception_ptr p) {
@@ -270,9 +268,7 @@ PYBIND11_NOINLINE inline internals &get_internals() {
         //
         // libstdc++ doesn't require this (types there are identified only by name)
 #if !defined(__GLIBCXX__)
-#if !defined (__PGIC__)
         (*internals_pp)->registered_exception_translators.push_front(&translate_local_exception);
-#endif
 #endif
     } else {
         if (!internals_pp) internals_pp = new internals*();
@@ -298,9 +294,7 @@ PYBIND11_NOINLINE inline internals &get_internals() {
         internals_ptr->istate = tstate->interp;
 #endif
         builtins[id] = capsule(internals_pp);
-#if !defined (__PGIC__)
         internals_ptr->registered_exception_translators.push_front(&translate_exception);
-#endif
         internals_ptr->static_property_type = make_static_property_type();
         internals_ptr->default_metaclass = make_default_metaclass();
         internals_ptr->instance_base = make_object_base_type(internals_ptr->default_metaclass);

include/pybind11/pybind11.h

@@ -50,6 +50,8 @@
 #  include <cxxabi.h>
 #endif
 
+#include <exception>
+
 PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
 
 /// Wraps an arbitrary C++ function/method/lambda function/.. into a callable Python object
@@ -740,7 +742,6 @@ class cpp_function : public function {
                 - do nothing and let the exception fall through to the next translator, or
                 - delegate translation to the next translator by throwing a new type of exception. */
 
-#if !defined (__PGIC__)
             auto last_exception = std::current_exception();
             auto &registered_exception_translators = get_internals().registered_exception_translators;
             for (auto& translator : registered_exception_translators) {
@@ -752,7 +753,6 @@ class cpp_function : public function {
                 }
                 return nullptr;
             }
-#endif
             PyErr_SetString(PyExc_SystemError, "Exception escaped from default exception translator!");
             return nullptr;
         }
@@ -1853,13 +1853,11 @@ template <typename InputType, typename OutputType> void implicitly_convertible()
         pybind11_fail("implicitly_convertible: Unable to find type " + type_id<OutputType>());
 }
 
-#if !defined (__PGIC__)
 template <typename ExceptionTranslator>
 void register_exception_translator(ExceptionTranslator&& translator) {
     detail::get_internals().registered_exception_translators.push_front(
         std::forward<ExceptionTranslator>(translator));
 }
-#endif
 
 /**
  * Wrapper to generate a new Python exception type.

tests/CMakeLists.txt

@@ -125,12 +125,6 @@ if(PYTHON_VERSION VERSION_LESS 3.5)
                         "Skipping test_async on Python 2")
 endif()
 
-if(CMAKE_CXX_COMPILER_ID MATCHES "PGI")
-  pybind11_filter_tests(
-    PYBIND11_TEST_FILES test_exceptions.cpp test_smart_ptr.cpp test_virtual_functions.cpp MESSAGE
-    "Skipping tests that do not support PGI compilers")
-endif()
-
 string(REPLACE ".cpp" ".py" PYBIND11_PYTEST_FILES "${PYBIND11_TEST_FILES}")
 
 # Contains the set of test files that require pybind11_cross_module_tests to be

tests/test_exceptions.py

@@ -3,8 +3,8 @@
 
 import pytest
 
-m = pytest.importorskip("pybind11_tests.exceptions")
-import pybind11_cross_module_tests as cm  # noqa: E402
+from pybind11_tests import exceptions as m
+import pybind11_cross_module_tests as cm
 
 
 def test_std_exception(msg):

tests/test_smart_ptr.py

@@ -1,9 +1,7 @@
 # -*- coding: utf-8 -*-
 import pytest
-
-m = pytest.importorskip("pybind11_tests.smart_ptr")
-
-from pybind11_tests import ConstructorStats  # noqa: E402
+from pybind11_tests import smart_ptr as m
+from pybind11_tests import ConstructorStats
 
 
 def test_smart_ptr(capture):

tests/test_virtual_functions.cpp

@@ -139,7 +139,7 @@ class NCVirt {
     std::string print_movable(int a, int b) { return get_movable(a, b).get_value(); }
 };
 class NCVirtTrampoline : public NCVirt {
-#if !defined(__INTEL_COMPILER)
+#if !defined(__INTEL_COMPILER) && !defined(__PGIC__)
     NonCopyable get_noncopyable(int a, int b) override {
         PYBIND11_OVERLOAD(NonCopyable, NCVirt, get_noncopyable, a, b);
     }
@@ -205,7 +205,7 @@ TEST_SUBMODULE(virtual_functions, m) {
         .def(py::init<int, int>());
 
     // test_move_support
-#if !defined(__INTEL_COMPILER)
+#if !defined(__INTEL_COMPILER) && !defined(__PGIC__)
     py::class_<NCVirt, NCVirtTrampoline>(m, "NCVirt")
         .def(py::init<>())
         .def("get_noncopyable", &NCVirt::get_noncopyable)

tests/test_virtual_functions.py

@@ -3,9 +3,8 @@
 
 import env  # noqa: F401
 
-m = pytest.importorskip("pybind11_tests.virtual_functions")
-
-from pybind11_tests import ConstructorStats  # noqa: E402
+from pybind11_tests import virtual_functions as m
+from pybind11_tests import ConstructorStats
 
 
 def test_override(capture, msg):