Enable type_caster_std_function_specializations with or without `re…

…turn_value_policy_pack` feature. This is for pybind/pybind11#5289 applied to smart_holder. PiperOrigin-RevId: 659808208
pybind · Aug 6, 2024 · e64ae68 · e64ae68
1 parent 8ccb4c7
commit e64ae68
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 15 deletions.
diff --git a/pybind11_abseil/status_caster.h b/pybind11_abseil/status_caster.h
@@ -120,10 +120,8 @@ struct type_caster<absl::Status> : public type_caster_base<absl::Status> {
   }
 };
 
-#if defined(PYBIND11_HAS_RETURN_VALUE_POLICY_PACK) && \
-    defined(PYBIND11_HAS_TYPE_CASTER_STD_FUNCTION_SPECIALIZATIONS)
+#if defined(PYBIND11_HAS_TYPE_CASTER_STD_FUNCTION_SPECIALIZATIONS)
 
-// This code requires https://github.com/google/pybind11k
 // IMPORTANT:
 //     KEEP
 //         type_caster<absl::Status>
@@ -141,7 +139,11 @@ struct func_wrapper<absl::Status, Args...> : func_wrapper_base {
     gil_scoped_acquire acq;
     try {
       object py_result =
+#if defined(PYBIND11_HAS_RETURN_VALUE_POLICY_PACK)
           hfunc.f.call_with_policies(rvpp, std::forward<Args>(args)...);
+#else
+          hfunc.f(std::forward<Args>(args)...);
+#endif
       try {
         return py_result.template cast<absl::Status>();
       } catch (cast_error& e) {

diff --git a/pybind11_abseil/statusor_caster.h b/pybind11_abseil/statusor_caster.h
@@ -124,9 +124,8 @@ struct type_caster<absl::StatusOr<PayloadType>> {
   }
 };
 
-#if defined(PYBIND11_HAS_RETURN_VALUE_POLICY_PACK)
+#if defined(PYBIND11_HAS_TYPE_CASTER_STD_FUNCTION_SPECIALIZATIONS)
 
-// This code requires https://github.com/google/pybind11k
 // IMPORTANT:
 //     KEEP
 //         type_caster<absl::StatusOr<PayloadType>>
@@ -144,7 +143,11 @@ struct func_wrapper<absl::StatusOr<PayloadType>, Args...> : func_wrapper_base {
     gil_scoped_acquire acq;
     try {
       object py_result =
+#if defined(PYBIND11_HAS_RETURN_VALUE_POLICY_PACK)
           hfunc.f.call_with_policies(rvpp, std::forward<Args>(args)...);
+#else
+          hfunc.f(std::forward<Args>(args)...);
+#endif
       try {
         auto cpp_result =
             py_result.template cast<absl::StatusOr<PayloadType>>();

diff --git a/pybind11_abseil/tests/status_testing_no_cpp_eh_pybind.cc b/pybind11_abseil/tests/status_testing_no_cpp_eh_pybind.cc
@@ -16,13 +16,6 @@ namespace status_testing_no_cpp_eh {
 PYBIND11_MODULE(status_testing_no_cpp_eh_pybind, m) {
   pybind11::google::ImportStatusModule();
 
-  m.attr("defined_PYBIND11_HAS_TYPE_CASTER_STD_FUNCTION_SPECIALIZATIONS") =
-#if defined(PYBIND11_HAS_TYPE_CASTER_STD_FUNCTION_SPECIALIZATIONS)
-      true;
-#else
-      false;
-#endif
-
   m.def("CallCallbackWithStatusReturn", &CallCallbackWithStatusReturn);
   m.def("CallCallbackWithStatusOrIntReturn",
         &CallCallbackWithStatusOrIntReturn);
@@ -31,8 +24,8 @@ PYBIND11_MODULE(status_testing_no_cpp_eh_pybind, m) {
         pybind11::return_value_policy::take_ownership);
   m.def("GenerateErrorStatusNotOk", &GenerateErrorStatusNotOk);
 
-  m.attr("defined_PYBIND11_HAS_RETURN_VALUE_POLICY_PACK") =
-#if defined(PYBIND11_HAS_RETURN_VALUE_POLICY_PACK)
+  m.attr("defined_PYBIND11_HAS_TYPE_CASTER_STD_FUNCTION_SPECIALIZATIONS") =
+#if defined(PYBIND11_HAS_TYPE_CASTER_STD_FUNCTION_SPECIALIZATIONS)
       true;
 #else
       false;

diff --git a/pybind11_abseil/tests/status_testing_no_cpp_eh_test_lib.py b/pybind11_abseil/tests/status_testing_no_cpp_eh_test_lib.py
@@ -185,7 +185,7 @@ def cb(arg):
 
     if (
         hasattr(self.tm, '__pyclif_codegen_mode__')
-        or self.tm.defined_PYBIND11_HAS_RETURN_VALUE_POLICY_PACK
+        or self.tm.defined_PYBIND11_HAS_TYPE_CASTER_STD_FUNCTION_SPECIALIZATIONS
     ):
       res = cc_fn(cb, 'exc')
       self.assertEqual(res, "!obj.ok()@ValueError: Unknown arg: 'exc'")