fix: expose required symbol using clang (#5700)

* test: Added test case for visibility of common symbols across shared libraries

* style: pre-commit fixes

* tests: cmake target name fix

* tests: Added visibility test to ci

* tests: set the default visibility to hidden

* prototype/proof-of-concept fix: PYBIND11_EXPORT_GUARDED_DELETE

* Fix silly oversight: actually use PYBIND11_EXPORT_GUARDED_DELETE

* Update struct_smart_holder.h

* style: pre-commit fixes

* Update include/pybind11/detail/struct_smart_holder.h

* Update struct_smart_holder.h

* ci: fix addition to reusable-standard.yml

* Update CMakeLists.txt

* refactor: rename tests to test_cross_module_rtti

Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>

---------

Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Henry Schreiner <HenrySchreinerIII@gmail.com>
Co-authored-by: Ralf W. Grosse-Kunstleve <rgrossekunst@nvidia.com>
This commit is contained in:
Peter Steneteg
2025-06-03 22:02:19 +02:00
committed by GitHub
parent d4d2ec1ad8
commit b19489145b
11 changed files with 268 additions and 3 deletions

View File

@@ -649,4 +649,7 @@ if(NOT PYBIND11_CUDA_TESTS)
# Test CMake build using functions and targets from subdirectory or installed location
add_subdirectory(test_cmake_build)
# Test visibility of common symbols across shared libraries
add_subdirectory(test_cross_module_rtti)
endif()

View File

@@ -0,0 +1,68 @@
possibly_uninitialized(PYTHON_MODULE_EXTENSION Python_INTERPRETER_ID)
set(CMAKE_CXX_VISIBILITY_PRESET hidden)
if("${PYTHON_MODULE_EXTENSION}" MATCHES "pypy"
OR "${Python_INTERPRETER_ID}" STREQUAL "PyPy"
OR "${PYTHON_MODULE_EXTENSION}" MATCHES "graalpy")
message(STATUS "Skipping visibility test on PyPy or GraalPy")
add_custom_target(test_cross_module_rtti
)# Dummy target on PyPy or GraalPy. Embedding is not supported.
set(_suppress_unused_variable_warning "${DOWNLOAD_CATCH}")
return()
endif()
if(TARGET Python::Module AND NOT TARGET Python::Python)
message(STATUS "Skipping visibility test since no embed libs found")
add_custom_target(test_cross_module_rtti) # Dummy target since embedding is not supported.
set(_suppress_unused_variable_warning "${DOWNLOAD_CATCH}")
return()
endif()
find_package(Catch 2.13.10)
if(CATCH_FOUND)
message(STATUS "Building interpreter tests using Catch v${CATCH_VERSION}")
else()
message(STATUS "Catch not detected. Interpreter tests will be skipped. Install Catch headers"
" manually or use `cmake -DDOWNLOAD_CATCH=ON` to fetch them automatically.")
return()
endif()
include(GenerateExportHeader)
add_library(test_cross_module_rtti_lib SHARED lib.h lib.cpp)
add_library(test_cross_module_rtti_lib::test_cross_module_rtti_lib ALIAS
test_cross_module_rtti_lib)
target_include_directories(test_cross_module_rtti_lib PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
target_include_directories(test_cross_module_rtti_lib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_compile_features(test_cross_module_rtti_lib PUBLIC cxx_std_11)
generate_export_header(test_cross_module_rtti_lib)
pybind11_add_module(test_cross_module_rtti_bindings SHARED bindings.cpp)
target_link_libraries(test_cross_module_rtti_bindings
PUBLIC test_cross_module_rtti_lib::test_cross_module_rtti_lib)
add_executable(test_cross_module_rtti_main catch.cpp test_cross_module_rtti.cpp)
target_link_libraries(
test_cross_module_rtti_main PUBLIC test_cross_module_rtti_lib::test_cross_module_rtti_lib
pybind11::embed Catch2::Catch2)
# Ensure that we have built the python bindings since we load them in main
add_dependencies(test_cross_module_rtti_main test_cross_module_rtti_bindings)
pybind11_enable_warnings(test_cross_module_rtti_main)
pybind11_enable_warnings(test_cross_module_rtti_bindings)
pybind11_enable_warnings(test_cross_module_rtti_lib)
add_custom_target(
test_cross_module_rtti
COMMAND "$<TARGET_FILE:test_cross_module_rtti_main>"
DEPENDS test_cross_module_rtti_main
WORKING_DIRECTORY "$<TARGET_FILE_DIR:test_cross_module_rtti_main>")
set_target_properties(test_cross_module_rtti_bindings PROPERTIES LIBRARY_OUTPUT_DIRECTORY
"${CMAKE_CURRENT_BINARY_DIR}")
add_dependencies(check test_cross_module_rtti)

View File

@@ -0,0 +1,20 @@
#include <pybind11/pybind11.h>
#include <lib.h>
class BaseTrampoline : public lib::Base, public pybind11::trampoline_self_life_support {
public:
using lib::Base::Base;
int get() const override { PYBIND11_OVERLOAD(int, lib::Base, get); }
};
PYBIND11_MODULE(test_cross_module_rtti_bindings, m) {
pybind11::classh<lib::Base, BaseTrampoline>(m, "Base")
.def(pybind11::init<int, int>())
.def_readwrite("a", &lib::Base::a)
.def_readwrite("b", &lib::Base::b);
m.def("get_foo", [](int a, int b) -> std::shared_ptr<lib::Base> {
return std::make_shared<lib::Foo>(a, b);
});
}

View File

@@ -0,0 +1,22 @@
// The Catch implementation is compiled here. This is a standalone
// translation unit to avoid recompiling it for every test change.
#include <pybind11/embed.h>
// Silence MSVC C++17 deprecation warning from Catch regarding std::uncaught_exceptions (up to
// catch 2.0.1; this should be fixed in the next catch release after 2.0.1).
PYBIND11_WARNING_DISABLE_MSVC(4996)
// Catch uses _ internally, which breaks gettext style defines
#ifdef _
# undef _
#endif
#define CATCH_CONFIG_RUNNER
#include <catch.hpp>
int main(int argc, char *argv[]) {
pybind11::scoped_interpreter guard{};
auto result = Catch::Session().run(argc, argv);
return result < 0xff ? result : 0xff;
}

View File

@@ -0,0 +1,13 @@
#include <lib.h>
namespace lib {
Base::Base(int a, int b) : a(a), b(b) {}
int Base::get() const { return a + b; }
Foo::Foo(int a, int b) : Base{a, b} {}
int Foo::get() const { return 2 * a + b; }
} // namespace lib

View File

@@ -0,0 +1,30 @@
#pragma once
#include <memory>
#include <test_cross_module_rtti_lib_export.h>
#if defined(_MSC_VER)
__pragma(warning(disable : 4251))
#endif
namespace lib {
class TEST_CROSS_MODULE_RTTI_LIB_EXPORT Base : public std::enable_shared_from_this<Base> {
public:
Base(int a, int b);
virtual ~Base() = default;
virtual int get() const;
int a;
int b;
};
class TEST_CROSS_MODULE_RTTI_LIB_EXPORT Foo : public Base {
public:
Foo(int a, int b);
int get() const override;
};
} // namespace lib

View File

@@ -0,0 +1,50 @@
#include <pybind11/embed.h>
#include <pybind11/pybind11.h>
#include <catch.hpp>
#include <lib.h>
static constexpr auto script = R"(
import test_cross_module_rtti_bindings
class Bar(test_cross_module_rtti_bindings.Base):
def __init__(self, a, b):
test_cross_module_rtti_bindings.Base.__init__(self, a, b)
def get(self):
return 4 * self.a + self.b
def get_bar(a, b):
return Bar(a, b)
)";
TEST_CASE("Simple case where without is_alias") {
// "Simple" case this will not have `python_instance_is_alias` set in type_cast_base.h:771
auto bindings = pybind11::module_::import("test_cross_module_rtti_bindings");
auto holder = bindings.attr("get_foo")(1, 2);
auto foo = holder.cast<std::shared_ptr<lib::Base>>();
REQUIRE(foo->get() == 4); // 2 * 1 + 2 = 4
}
TEST_CASE("Complex case where with it_alias") {
// "Complex" case this will have `python_instance_is_alias` set in type_cast_base.h:771
pybind11::exec(script);
auto main = pybind11::module::import("__main__");
// The critical part of "Bar" is that it will have the `is_alias` `instance` flag set.
// I'm not quite sure what is required to get that flag, this code is derived from a
// larger code where this issue was observed.
auto holder2 = main.attr("get_bar")(1, 2);
// this will trigger `std::get_deleter<memory::guarded_delete>` in type_cast_base.h:772
// This will fail since the program will see two different typeids for `memory::guarded_delete`
// on from the bindings module and one from "main", which will both have
// `__is_type_name_unique` as true and but still have different values. Hence we will not find
// the deleter and the cast fill fail. See "__eq(__type_name_t __lhs, __type_name_t __rhs)" in
// typeinfo in libc++
auto bar = holder2.cast<std::shared_ptr<lib::Base>>();
REQUIRE(bar->get() == 6); // 4 * 1 + 2 = 6
}