Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2025-01-31 15:20:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

load_type fixes & follow-on cleanup

Browse Source
This commit is contained in:
Ralf W. Grosse-Kunstleve 2022-06-21 02:40:40 -07:00
parent 24d450bf74
commit 0f9bb4c892
5 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
include/pybind11/cast.h
View File

@ -56,15 +56,27 @@ namespace {
template <typename IntrinsicType>
bool odr_guard_impl(const std::type_index &it_ti, const char *tc_id) {
printf("\nLOOOK %s %s\n", type_id<IntrinsicType>().c_str(), tc_id);
// std::cout cannot be used here: static initialization could be incomplete.
#define PYBIND11_DETAIL_ODR_GUARD_IMPL_PRINTF_OFF
#ifdef PYBIND11_DETAIL_ODR_GUARD_IMPL_PRINTF_ON
fprintf(stdout, "\nODR_GUARD_IMPL %s %s\n", type_id<IntrinsicType>().c_str(), tc_id);
fflush(stdout);
#endif
std::string tc_id_str{tc_id};
auto [reg_iter, added] = odr_guard_registry().insert({it_ti, tc_id_str});
if (!added && reg_iter->second != tc_id_str) {
throw std::system_error(std::make_error_code(std::errc::state_not_recoverable),
"pybind11::detail::type_caster<" + type_id<IntrinsicType>()
+ "> ODR VIOLATION DETECTED: Location1=\"" + reg_iter->second
+ "\", Location2=\"" + tc_id_str + "\"");
std::system_error err(std::make_error_code(std::errc::state_not_recoverable),
"ODR VIOLATION DETECTED: pybind11::detail::type_caster<"
+ type_id<IntrinsicType>() + ">: SourceLocation1=\""
+ reg_iter->second + "\", SourceLocation2=\"" + tc_id_str
+ "\"");
#define PYBIND11_TYPE_CASTER_ODR_GUARD_THROW_OFF
#ifdef PYBIND11_TYPE_CASTER_ODR_GUARD_THROW_ON
throw err;
#else
fprintf(stderr, "\nDISABLED std::system_error: %s\n", err.what());
fflush(stderr);
#endif
}
return true;
}
@ -98,13 +110,13 @@ struct type_uses_smart_holder_type_caster {
// Shortcut for calling a caster's `cast_op_type` cast operator for casting a type_caster to a T
template <typename T>
typename make_caster<T>::template cast_op_type<T> cast_op(make_caster<T> &caster) { // LOOOK
typename make_caster<T>::template cast_op_type<T> cast_op(make_caster<T> &caster) {
PYBIND11_DETAIL_TYPE_CASTER_ACCESS_TRANSLATION_UNIT_LOCAL(T)
return caster.operator typename make_caster<T>::template cast_op_type<T>();
}
template <typename T>
typename make_caster<T>::template cast_op_type<typename std::add_rvalue_reference<T>::type>
cast_op(make_caster<T> &&caster) { // LOOOK
cast_op(make_caster<T> &&caster) {
PYBIND11_DETAIL_TYPE_CASTER_ACCESS_TRANSLATION_UNIT_LOCAL(T)
return std::move(caster).operator typename make_caster<T>::
template cast_op_type<typename std::add_rvalue_reference<T>::type>();
@ -1095,8 +1107,8 @@ struct return_value_policy_override<
};
// Basic python -> C++ casting; throws if casting fails
template <typename T, typename SFINAE>
type_caster<T, SFINAE> &load_type(type_caster<T, SFINAE> &conv, const handle &handle) {
template <typename T>
make_caster<T> &load_type(make_caster<T> &conv, const handle &handle) {
static_assert(!detail::is_pyobject<T>::value,
"Internal error: type_caster should only be used for C++ types");
if (!conv.load(handle, true)) {
@ -1116,7 +1128,7 @@ template <typename T>
make_caster<T> load_type(const handle &handle) {
PYBIND11_DETAIL_TYPE_CASTER_ACCESS_TRANSLATION_UNIT_LOCAL(T)
make_caster<T> conv;
load_type(conv, handle);
load_type<T>(conv, handle);
return conv;
}
@ -1254,7 +1266,7 @@ template <typename T>
enable_if_t<cast_is_temporary_value_reference<T>::value, T> cast_ref(object &&o,
make_caster<T> &caster) {
PYBIND11_DETAIL_TYPE_CASTER_ACCESS_TRANSLATION_UNIT_LOCAL(T)
return cast_op<T>(load_type(caster, o));
return cast_op<T>(load_type<T>(caster, o));
}
template <typename T>
enable_if_t<!cast_is_temporary_value_reference<T>::value, T> cast_ref(object &&,

2
include/pybind11/pybind11.h
View File

@ -3013,7 +3013,7 @@ function get_override(const T *this_ptr, const char *name) {
auto o = override(__VA_ARGS__); \
if (pybind11::detail::cast_is_temporary_value_reference<ret_type>::value) { \
static pybind11::detail::override_caster_t<ret_type> caster; \
return pybind11::detail::cast_ref<ret_type>(std::move(o), caster); /* LOOOK */ \
return pybind11::detail::cast_ref<ret_type>(std::move(o), caster); \
} \
return pybind11::detail::cast_safe<ret_type>(std::move(o)); \
} \

4
tests/test_odr_guard_2.py
View File

@ -2,8 +2,8 @@ import pybind11_tests.odr_guard_2 as m
def test_type_mrc_to_python():
assert m.type_mrc_to_python() == 2222
assert m.type_mrc_to_python() in (202 + 2020, 202 + 1010)
def test_type_mrc_from_python():
assert m.type_mrc_from_python("ignored") == 222
assert m.type_mrc_from_python("ignored") in (200 + 22, 200 + 11)

2
tests/test_virtual_functions.cpp
View File

@ -78,7 +78,6 @@ public:
);
}
#ifdef JUNK
// We can return reference types for compatibility with C++ virtual interfaces that do so, but
// note they have some significant limitations (see the documentation).
const std::string &get_string1() override {
@ -96,7 +95,6 @@ public:
/* (no arguments) */
);
}
#endif
};
class NonCopyable {

1
tests/test_virtual_functions.py
View File

@ -50,7 +50,6 @@ def test_override(capture, msg):
== 'Tried to call pure virtual function "ExampleVirt::pure_virtual"'
)
pytest.skip("TODO")
ex12p = ExtendedExampleVirt(10)
with capture:
assert m.runExampleVirt(ex12p, 20) == 32