Add debug output

Author: rhaschke

include/pybind11/stl.h

@@ -13,6 +13,7 @@
 #include "detail/common.h"
 
 #include <deque>
+#include <iostream>
 #include <list>
 #include <map>
 #include <ostream>
@@ -116,6 +117,10 @@ struct map_caster {
     void reserve_maybe(const dict &, void *) {}
 
 public:
+#define DEBUG(value) std::cerr << __func__ << ": " << &value << " #: " << value.size() << "\n"
+
+    map_caster() { DEBUG(value); }
+    ~map_caster() { DEBUG(value); }
     bool load(handle src, bool convert) {
         if (!isinstance<dict>(src)) {
             return false;
@@ -131,11 +136,13 @@ struct map_caster {
             }
             value.emplace(cast_op<Key &&>(std::move(kconv)), cast_op<Value &&>(std::move(vconv)));
         }
+        DEBUG(value);
         return true;
     }
 
     template <typename T>
     static handle cast(T &&src, return_value_policy policy, handle parent) {
+        DEBUG(src);
         dict d;
         return_value_policy policy_key = policy;
         return_value_policy policy_value = policy;
@@ -156,9 +163,40 @@ struct map_caster {
         return d.release();
     }
 
-    PYBIND11_TYPE_CASTER(Type,
-                         const_name("Dict[") + key_conv::name + const_name(", ") + value_conv::name
-                             + const_name("]"));
+protected:
+    Type value;
+
+public:
+    static constexpr auto name = _("Dict[") + key_conv::name + _(", ") + value_conv::name + _("]");
+    template <typename T, enable_if_t<std::is_same<Type, remove_cv_t<T>>::value, int> = 0>
+    static handle cast(T *src, return_value_policy policy, handle parent) {
+        if (!src)
+            return none().release();
+        if (policy == return_value_policy::take_ownership) {
+            auto h = cast(std::move(*src), policy, parent);
+            delete src;
+            return h;
+        } else {
+            return cast(*src, policy, parent);
+        }
+    }
+    operator Type *() {
+        DEBUG(value);
+        return &value;
+    }
+    operator Type &() {
+        DEBUG(value);
+        return value;
+    }
+    operator Type &&() && {
+        DEBUG(value);
+        return std::move(value);
+    }
+
+    template <typename T>
+    using cast_op_type = pybind11::detail::movable_cast_op_type<T>;
+
+#undef DEBUG
 };
 
 template <typename Type, typename Value>

tests/CMakeLists.txt

@@ -526,7 +526,7 @@ set(PYBIND11_TEST_PREFIX_COMMAND
 # A single command to compile and run the tests
 add_custom_target(
   pytest
-  COMMAND ${PYBIND11_TEST_PREFIX_COMMAND} ${PYTHON_EXECUTABLE} -m pytest
+  COMMAND ${PYBIND11_TEST_PREFIX_COMMAND} ${PYTHON_EXECUTABLE} -m pytest -v
           ${PYBIND11_ABS_PYTEST_FILES}
   DEPENDS ${test_targets}
   WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"

tests/test_stl.cpp

@@ -204,7 +204,10 @@ TEST_SUBMODULE(stl, m) {
     m.def("load_map", [](const std::map<std::string, std::string> &map) {
         return map.at("key") == "value" && map.at("key2") == "value2";
     });
-    m.def("copy_map", [](std::map<std::string, double> map) { auto m = std::move(map); });
+    m.def("copy_map", [](std::map<std::string, double> map) {
+        std::cerr << "copy_map: " << &map << " #: " << map.size() << std::endl;
+        auto m = std::move(map);
+    });
 
     // test_set
     m.def("cast_set", []() { return std::set<std::string>{"key1", "key2"}; });