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

Disable type_caster ODR guard for __INTEL_COMPILER (see comment). Also turn off printf.

Browse Source
This commit is contained in:
Ralf W. Grosse-Kunstleve 2022-06-28 20:43:09 -07:00
parent 37e583bab8
commit 9ba32bde5e
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,11 +6,16 @@
// The type_caster ODR guard feature requires Translation-Unit-local entities // The type_caster ODR guard feature requires Translation-Unit-local entities
// (https://en.cppreference.com/w/cpp/language/tu_local), a C++20 feature, but // (https://en.cppreference.com/w/cpp/language/tu_local), a C++20 feature, but
// all tested C++17 compilers support this feature already. // almost all tested C++17 compilers support this feature already.
#if !defined(PYBIND11_TYPE_CASTER_ODR_GUARD_ON) && !defined(PYBIND11_TYPE_CASTER_ODR_GUARD_OFF) \ #if !defined(PYBIND11_TYPE_CASTER_ODR_GUARD_ON) && !defined(PYBIND11_TYPE_CASTER_ODR_GUARD_OFF) \
&& !defined(__INTEL_COMPILER) \
&& ((defined(_MSC_VER) && _MSC_VER >= 1920) || defined(PYBIND11_CPP17)) && ((defined(_MSC_VER) && _MSC_VER >= 1920) || defined(PYBIND11_CPP17))
# define PYBIND11_TYPE_CASTER_ODR_GUARD_ON # define PYBIND11_TYPE_CASTER_ODR_GUARD_ON
#endif #endif
// To explain the above:
// * MSVC 2017 does not support __builtin_FILE(), __builtin_LINE().
// * Intel 2021.6.0.20220226 (g++ 9.4 mode) __builtin_LINE() is unreliable
// (line numbers vary between translation units).
#ifndef PYBIND11_TYPE_CASTER_ODR_GUARD_ON #ifndef PYBIND11_TYPE_CASTER_ODR_GUARD_ON
@ -20,8 +25,7 @@
#else #else
# if !defined(PYBIND11_CPP20) && defined(__GNUC__) && !defined(__clang__) \ # if !defined(PYBIND11_CPP20) && defined(__GNUC__) && !defined(__clang__)
&& !defined(__INTEL_COMPILER)
# pragma GCC diagnostic ignored "-Wsubobject-linkage" # pragma GCC diagnostic ignored "-Wsubobject-linkage"
# endif # endif
@ -82,15 +86,15 @@ inline void type_caster_odr_guard_impl(const std::type_info &intrinsic_type_info
const char *source_file_line_from_macros, const char *source_file_line_from_macros,
const src_loc &sloc, const src_loc &sloc,
bool throw_disabled) { bool throw_disabled) {
std::string source_file_line_from_sloc
= std::string(sloc.file) + ':' + std::to_string(sloc.line);
// std::cout cannot be used here: static initialization could be incomplete. // std::cout cannot be used here: static initialization could be incomplete.
# define PYBIND11_DETAIL_TYPE_CASTER_ODR_GUARD_IMPL_PRINTF_ON # define PYBIND11_DETAIL_TYPE_CASTER_ODR_GUARD_IMPL_PRINTF_OFF
# ifdef PYBIND11_DETAIL_TYPE_CASTER_ODR_GUARD_IMPL_PRINTF_ON # ifdef PYBIND11_DETAIL_TYPE_CASTER_ODR_GUARD_IMPL_PRINTF_ON
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_from_macros); source_file_line_from_macros);
std::string source_file_line_from_sloc
= 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_from_macros (source_file_line_from_sloc == source_file_line_from_macros
@ -99,6 +103,8 @@ inline void type_caster_odr_guard_impl(const std::type_info &intrinsic_type_info
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);
# else
silence_unused_warnings(source_file_line_from_macros);
# 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_from_sloc}); {std::type_index(intrinsic_type_info), source_file_line_from_sloc});