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

Use source_file_line_from_sloc in type_caster_odr_guard_registry

Browse Source
This commit is contained in:
Ralf W. Grosse-Kunstleve 2022-06-28 19:38:47 -07:00
parent 4b6d3b87a7
commit 37e583bab8
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
include/pybind11/detail/type_caster_odr_guard.h
View File

@ -64,14 +64,14 @@ inline unsigned &type_caster_odr_violation_detected_counter() {
return counter; return counter;
} }
inline const char *source_file_line_basename(const char *sfl) { inline std::string source_file_line_basename(const char *sfl) {
unsigned i_base = 0; unsigned i_base = 0;
for (unsigned i = 0; sfl[i] != '\0'; i++) { for (unsigned i = 0; sfl[i] != '\0'; i++) {
if (sfl[i] == '/' || sfl[i] == '\\') { if (sfl[i] == '/' || sfl[i] == '\\') {
i_base = i + 1; i_base = i + 1;
} }
} }
return sfl + i_base; return std::string(sfl + i_base);
} }
# ifndef PYBIND11_DETAIL_TYPE_CASTER_ODR_GUARD_IMPL_THROW_DISABLED # ifndef PYBIND11_DETAIL_TYPE_CASTER_ODR_GUARD_IMPL_THROW_DISABLED
@ -79,7 +79,7 @@ inline const char *source_file_line_basename(const char *sfl) {
# endif # endif
inline void type_caster_odr_guard_impl(const std::type_info &intrinsic_type_info, inline void type_caster_odr_guard_impl(const std::type_info &intrinsic_type_info,
const char *source_file_line, const char *source_file_line_from_macros,
const src_loc &sloc, const src_loc &sloc,
bool throw_disabled) { bool throw_disabled) {
// std::cout cannot be used here: static initialization could be incomplete. // std::cout cannot be used here: static initialization could be incomplete.
@ -88,28 +88,29 @@ inline void type_caster_odr_guard_impl(const std::type_info &intrinsic_type_info
std::fprintf(stdout, std::fprintf(stdout,
"\nTYPE_CASTER_ODR_GUARD_IMPL %s %s\n", "\nTYPE_CASTER_ODR_GUARD_IMPL %s %s\n",
clean_type_id(intrinsic_type_info.name()).c_str(), clean_type_id(intrinsic_type_info.name()).c_str(),
source_file_line); source_file_line_from_macros);
std::string source_file_line_from_sloc std::string source_file_line_from_sloc
= std::string(sloc.file) + ':' + std::to_string(sloc.line); = std::string(sloc.file) + ':' + std::to_string(sloc.line);
std::fprintf(stdout, std::fprintf(stdout,
"%s %s %s\n", "%s %s %s\n",
(source_file_line_from_sloc == source_file_line ? " SLOC_SAME" (source_file_line_from_sloc == source_file_line_from_macros
: " SLOC_DIFF"), ? " SLOC_SAME"
: " SLOC_DIFF"),
clean_type_id(intrinsic_type_info.name()).c_str(), clean_type_id(intrinsic_type_info.name()).c_str(),
source_file_line_from_sloc.c_str()); source_file_line_from_sloc.c_str());
std::fflush(stdout); std::fflush(stdout);
# endif # endif
auto ins = type_caster_odr_guard_registry().insert( auto ins = type_caster_odr_guard_registry().insert(
{std::type_index(intrinsic_type_info), source_file_line}); {std::type_index(intrinsic_type_info), source_file_line_from_sloc});
auto reg_iter = ins.first; auto reg_iter = ins.first;
auto added = ins.second; auto added = ins.second;
if (!added if (!added
&& strcmp(source_file_line_basename(reg_iter->second.c_str()), && source_file_line_basename(reg_iter->second.c_str())
source_file_line_basename(source_file_line)) != source_file_line_basename(source_file_line_from_sloc.c_str())) {
!= 0) {
std::string msg("ODR VIOLATION DETECTED: pybind11::detail::type_caster<" std::string msg("ODR VIOLATION DETECTED: pybind11::detail::type_caster<"
+ clean_type_id(intrinsic_type_info.name()) + ">: SourceLocation1=\"" + clean_type_id(intrinsic_type_info.name()) + ">: SourceLocation1=\""
+ reg_iter->second + "\", SourceLocation2=\"" + source_file_line + "\""); + reg_iter->second + "\", SourceLocation2=\"" + source_file_line_from_sloc
+ "\"");
if (throw_disabled) { if (throw_disabled) {
std::fprintf(stderr, "\nDISABLED std::system_error: %s\n", msg.c_str()); std::fprintf(stderr, "\nDISABLED std::system_error: %s\n", msg.c_str());
std::fflush(stderr); std::fflush(stderr);