Merge remote-tracking branch 'origin/master' into devel

Author: lyskov

.github/workflows/main.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: [29, 30, 31, 32, 33, 34, 35, 36, 37]
+        version: [29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40]
     runs-on: ubuntu-latest
     name: Binder_on_Fedora${{ matrix.version }}
     container:

CMakeLists.txt

@@ -46,6 +46,11 @@ if (Clang_FOUND AND LLVM_FOUND AND NOT LLVMCONFIG )
     ${LLVM_LIBRARY_DIR}/../../lib/clang/${LLVM_VERSION}/include
     ${LLVM_LIBRARY_DIR}/../../lib64/clang/${LLVM_VERSION}/include
     ${CLANG_INCLUDE_DIRS}/clang/${LLVM_VERSION}/include
+    ${LLVM_LIBRARY_DIR}/clang/${LLVM_VERSION_MAJOR}/include
+    ${LLVM_LIBRARY_DIR}/../clang/${LLVM_VERSION_MAJOR}/include
+    ${LLVM_LIBRARY_DIR}/../../lib/clang/${LLVM_VERSION_MAJOR}/include
+    ${LLVM_LIBRARY_DIR}/../../lib64/clang/${LLVM_VERSION_MAJOR}/include
+    ${CLANG_INCLUDE_DIRS}/clang/${LLVM_VERSION_MAJOR}/include
     ${LLVM_LIBRARY_DIR}/clang/${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}/include
     ${LLVM_LIBRARY_DIR}/../clang/${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}/include
     ${LLVM_LIBRARY_DIR}/../../lib/clang/${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}/include

build.py

@@ -14,7 +14,7 @@
 
 from __future__ import print_function
 
-import os, sys, argparse, platform, subprocess, imp, shutil, distutils.dir_util, json
+import os, sys, argparse, platform, subprocess, shutil, json
 
 from collections import OrderedDict
 

source/class.cpp

@@ -616,7 +616,11 @@ bool is_callback_structure_needed(CXXRecordDecl const *C)
 	// check if all pure-virtual methods could be overridden in Python
 	if( C->isAbstract() ) {
 		for( auto m = C->method_begin(); m != C->method_end(); ++m ) {
+#if( LLVM_VERSION_MAJOR >= 18 )
+			if( m->isPureVirtual() and is_const_overload(*m) ) return false; // it is not clear how to deal with this case since we can't overrdie const versions in Python, - so disabling for now
+#else
 			if( m->isPure() and is_const_overload(*m) ) return false; // it is not clear how to deal with this case since we can't overrdie const versions in Python, - so disabling for now
+#endif
 		}
 	}
 
@@ -644,7 +648,11 @@ bool is_callback_structure_constructible(CXXRecordDecl const *C)
 {
 	if( C->isAbstract() ) {
 		for( auto m = C->method_begin(); m != C->method_end(); ++m ) {
+#if( LLVM_VERSION_MAJOR >= 18 )
+			if( m->isPureVirtual() and !isa<CXXConstructorDecl>(*m) and (m->getAccess() == AS_private or !is_bindable(*m) or is_skipping_requested(*m, Config::get())) ) return false;
+#else
 			if( m->isPure() and !isa<CXXConstructorDecl>(*m) and (m->getAccess() == AS_private or !is_bindable(*m) or is_skipping_requested(*m, Config::get())) ) return false;
+#endif
 		}
 
 		for( auto b = C->bases_begin(); b != C->bases_end(); ++b ) {
@@ -692,7 +700,7 @@ if (overload) {{
 		static pybind11::detail::override_caster_t<{3}> caster;
 		return pybind11::detail::cast_ref<{3}>(std::move(o), caster);
 	}}
-	else return pybind11::detail::cast_safe<{3}>(std::move(o));
+	return pybind11::detail::cast_safe<{3}>(std::move(o));
 }}
 )_";
 
@@ -744,6 +752,7 @@ string bind_member_functions_for_call_back(CXXRecordDecl const *C, string const
 				if( return_type.find(',') != std::string::npos ) {
 					string return_type_alias = "_binder_ret_" + std::to_string(ret_id);
 					++ret_id;
+					if (begins_with(return_type,"class ")) return_type = return_type.substr(6);
 					c += "\tusing {} = {};\n"_format(return_type_alias, return_type);
 					return_type = std::move(return_type_alias);
 				}
@@ -766,7 +775,11 @@ string bind_member_functions_for_call_back(CXXRecordDecl const *C, string const
 				string custom_function_info = Config::get().is_custom_trampoline_function_requested(member_function_name);
 				if( custom_function_info == "" ) {
 					c += indent(fmt::format(call_back_function_body_template, class_name, /*class_qualified_name(C), */ python_name, std::get<1>(args), return_type), "\t\t");
+#if( LLVM_VERSION_MAJOR >= 18 )
+					if( m->isPureVirtual() ) c += "\t\tpybind11::pybind11_fail(\"Tried to call pure virtual function \\\"{}::{}\\\"\");\n"_format(C->getNameAsString(), python_name);
+#else
 					if( m->isPure() ) c += "\t\tpybind11::pybind11_fail(\"Tried to call pure virtual function \\\"{}::{}\\\"\");\n"_format(C->getNameAsString(), python_name);
+#endif
 					else c += "\t\treturn {}::{}({});\n"_format(C->getNameAsString(), m->getNameAsString(), std::get<1>(args));
 				}
 				else {

source/context.cpp

@@ -89,7 +89,7 @@ const char *main_module_header = R"_(#include <map>
 
 {0}
 
-typedef std::function< pybind11::module & (std::string const &) > ModuleGetter;
+using ModuleGetter = std::function< pybind11::module & (std::string const &) >;
 
 {1}
 
@@ -110,13 +110,13 @@ PYBIND11_MODULE({2}, root_module) {{
 	auto mangle_namespace_name(
 		[](std::string const &ns) -> std::string {{
 			if ( std::find(reserved_python_words.begin(), reserved_python_words.end(), ns) == reserved_python_words.end() ) return ns;
-			else return ns+'_';
+			return ns+'_';
 		}}
 	);
 
 	std::vector< std::pair<std::string, std::string> > sub_modules {{
 {3}	}};
-	for(auto &p : sub_modules ) modules[p.first.size() ? p.first+"::"+p.second : p.second] = modules[p.first].def_submodule( mangle_namespace_name(p.second).c_str(), ("Bindings for " + p.first + "::" + p.second + " namespace").c_str() );
+	for(auto &p : sub_modules ) modules[ p.first.empty() ? p.second :  p.first+"::"+p.second ] = modules[p.first].def_submodule( mangle_namespace_name(p.second).c_str(), ("Bindings for " + p.first + "::" + p.second + " namespace").c_str() );
 
 	//pybind11::class_<std::shared_ptr<void>>(M(""), "_encapsulated_data_");
 
@@ -132,7 +132,7 @@ const char *module_header = R"_(
 #ifndef BINDER_PYBIND11_TYPE_CASTER
 	#define BINDER_PYBIND11_TYPE_CASTER
 	{2}
-	PYBIND11_DECLARE_HOLDER_TYPE(T, T*)
+	PYBIND11_DECLARE_HOLDER_TYPE(T, T*, false)
 	{3}
 #endif
 
@@ -437,7 +437,7 @@ void Context::generate(Config const &config)
 
 		string const holder_type = Config::get().holder_type();
 
-		string shared_declare = "PYBIND11_DECLARE_HOLDER_TYPE(T, "+holder_type+"<T>)";
+		string shared_declare = "PYBIND11_DECLARE_HOLDER_TYPE(T, "+holder_type+"<T>, false)";
 		string shared_make_opaque = "PYBIND11_MAKE_OPAQUE("+holder_type+"<void>)";
 
 		string const pybind11_include = "#include <" + Config::get().pybind11_include_file() + ">";

source/function.hpp

@@ -14,6 +14,7 @@
 #define _INCLUDED_function_hpp_
 
 #include <binder.hpp>
+#include <config.hpp>
 
 #include <clang/AST/Decl.h>
 #include <clang/AST/DeclCXX.h>

test/CMakeLists.txt

@@ -150,6 +150,10 @@ if (pybind11_VERSION VERSION_LESS 2.5.99)
  list(REMOVE_ITEM binder_tests T11.override)
  list(REMOVE_ITEM binder_tests T15.inner_class)
 endif()
+if (LLVM_VERSION_MAJOR VERSION_GREATER 15)
+ list(REMOVE_ITEM binder_tests T15.inner_class)
+ list(REMOVE_ITEM binder_tests T17.anonymous)
+endif()
 if( CMAKE_HOST_SYSTEM_NAME MATCHES "Darwin" )
  list(REMOVE_ITEM binder_tests T42.stl.names.multimap)
  list(REMOVE_ITEM binder_tests T42.stl.names.multiset)