[Bf-blender-cvs] [b4956ad6e0e] temp-cpp-type-cleanup: better support types that don't have all special member functions
Jacques Lucke
noreply at git.blender.org
Sun Jun 27 17:07:05 CEST 2021
Commit: b4956ad6e0e97a96a102e746665dd191a177dd7d
Author: Jacques Lucke
Date: Sun Jun 27 15:08:06 2021 +0200
Branches: temp-cpp-type-cleanup
https://developer.blender.org/rBb4956ad6e0e97a96a102e746665dd191a177dd7d
better support types that don't have all special member functions
===================================================================
M source/blender/functions/FN_cpp_type.hh
M source/blender/functions/FN_cpp_type_make.hh
M source/blender/modifiers/intern/MOD_nodes_evaluator.cc
===================================================================
diff --git a/source/blender/functions/FN_cpp_type.hh b/source/blender/functions/FN_cpp_type.hh
index a8cc8494585..1782000785d 100644
--- a/source/blender/functions/FN_cpp_type.hh
+++ b/source/blender/functions/FN_cpp_type.hh
@@ -77,7 +77,8 @@ struct CPPTypeMembers {
int64_t size = 0;
int64_t alignment = 0;
uintptr_t alignment_mask = 0;
- bool is_trivially_destructible = 0;
+ bool is_trivially_destructible = false;
+ bool has_special_member_functions = false;
void (*construct_default)(void *ptr) = nullptr;
void (*construct_default_indices)(void *ptr, IndexMask mask) = nullptr;
@@ -126,6 +127,9 @@ class CPPType : NonCopyable, NonMovable {
{
BLI_assert(is_power_of_2_i(m_.alignment));
m_.alignment_mask = (uintptr_t)members.alignment - (uintptr_t)1;
+ m_.has_special_member_functions = (m_.construct_default && m_.copy_to_uninitialized &&
+ m_.copy_to_initialized && m_.move_to_uninitialized &&
+ m_.move_to_initialized && m_.destruct);
}
/**
@@ -192,6 +196,50 @@ class CPPType : NonCopyable, NonMovable {
return m_.is_trivially_destructible;
}
+ bool is_default_constructible() const
+ {
+ return m_.construct_default != nullptr;
+ }
+
+ bool is_copy_constructible() const
+ {
+ return m_.copy_to_initialized != nullptr;
+ }
+
+ bool is_move_constructible() const
+ {
+ return m_.move_to_initialized != nullptr;
+ }
+
+ bool is_destructible() const
+ {
+ return m_.destruct != nullptr;
+ }
+
+ bool is_copy_assignable() const
+ {
+ return m_.copy_to_initialized != nullptr;
+ }
+
+ bool is_move_assignable() const
+ {
+ return m_.copy_to_uninitialized != nullptr;
+ }
+
+ /**
+ * Returns true, when the type has the following functions:
+ * - Default constructor.
+ * - Copy constructor.
+ * - Move constructor.
+ * - Copy assignment operator.
+ * - Move assignment operator.
+ * - Destructor.
+ */
+ bool has_special_member_functions() const
+ {
+ return m_.has_special_member_functions;
+ }
+
/**
* Returns true, when the given pointer fulfills the alignment requirement of this type.
*/
diff --git a/source/blender/functions/FN_cpp_type_make.hh b/source/blender/functions/FN_cpp_type_make.hh
index 8022e5b8145..81fb09d0731 100644
--- a/source/blender/functions/FN_cpp_type_make.hh
+++ b/source/blender/functions/FN_cpp_type_make.hh
@@ -190,39 +190,63 @@ template<typename T> uint64_t hash_cb(const void *value)
namespace blender::fn {
-template<typename T>
-inline std::unique_ptr<const CPPType> create_cpp_type(StringRef name, const T &default_value)
+template<typename T> inline std::unique_ptr<const CPPType> create_cpp_type(StringRef name)
{
using namespace cpp_type_util;
+
+ static T default_value;
+
CPPTypeMembers m;
m.name = name;
m.size = (int64_t)sizeof(T);
m.alignment = (int64_t)alignof(T);
+ m.default_value = (void *)&default_value;
m.is_trivially_destructible = std::is_trivially_destructible_v<T>;
- m.construct_default = construct_default_cb<T>;
- m.construct_default_indices = construct_default_indices_cb<T>;
- m.destruct = destruct_cb<T>;
- m.destruct_indices = destruct_indices_cb<T>;
- m.copy_to_initialized = copy_to_initialized_cb<T>;
- m.copy_to_initialized_indices = copy_to_initialized_indices_cb<T>;
- m.copy_to_uninitialized = copy_to_uninitialized_cb<T>;
- m.copy_to_uninitialized_indices = copy_to_uninitialized_indices_cb<T>;
- m.move_to_initialized = move_to_initialized_cb<T>;
- m.move_to_initialized_indices = move_to_initialized_indices_cb<T>;
- m.move_to_uninitialized = move_to_uninitialized_cb<T>;
- m.move_to_uninitialized_indices = move_to_uninitialized_indices_cb<T>;
- m.relocate_to_initialized = relocate_to_initialized_cb<T>;
- m.relocate_to_initialized_indices = relocate_to_initialized_indices_cb<T>;
- m.relocate_to_uninitialized = relocate_to_uninitialized_cb<T>;
- m.relocate_to_uninitialized_indices = relocate_to_uninitialized_indices_cb<T>;
- m.fill_initialized = fill_initialized_cb<T>;
- m.fill_initialized_indices = fill_initialized_indices_cb<T>;
- m.fill_uninitialized = fill_uninitialized_cb<T>;
- m.fill_uninitialized_indices = fill_uninitialized_indices_cb<T>;
+ if constexpr (std::is_default_constructible_v<T>) {
+ m.construct_default = construct_default_cb<T>;
+ m.construct_default_indices = construct_default_indices_cb<T>;
+ }
+ if constexpr (std::is_destructible_v<T>) {
+ m.destruct = destruct_cb<T>;
+ m.destruct_indices = destruct_indices_cb<T>;
+ }
+ if constexpr (std::is_copy_assignable_v<T>) {
+ m.copy_to_initialized = copy_to_initialized_cb<T>;
+ m.copy_to_initialized_indices = copy_to_initialized_indices_cb<T>;
+ }
+ if constexpr (std::is_copy_constructible_v<T>) {
+ m.copy_to_uninitialized = copy_to_uninitialized_cb<T>;
+ m.copy_to_uninitialized_indices = copy_to_uninitialized_indices_cb<T>;
+ }
+ if constexpr (std::is_move_assignable_v<T>) {
+ m.move_to_initialized = move_to_initialized_cb<T>;
+ m.move_to_initialized_indices = move_to_initialized_indices_cb<T>;
+ }
+ if constexpr (std::is_move_constructible_v<T>) {
+ m.move_to_uninitialized = move_to_uninitialized_cb<T>;
+ m.move_to_uninitialized_indices = move_to_uninitialized_indices_cb<T>;
+ }
+ if constexpr (std::is_destructible_v<T>) {
+ if constexpr (std::is_move_assignable_v<T>) {
+ m.relocate_to_initialized = relocate_to_initialized_cb<T>;
+ m.relocate_to_initialized_indices = relocate_to_initialized_indices_cb<T>;
+ }
+ if constexpr (std::is_move_constructible_v<T>) {
+ m.relocate_to_uninitialized = relocate_to_uninitialized_cb<T>;
+ m.relocate_to_uninitialized_indices = relocate_to_uninitialized_indices_cb<T>;
+ }
+ }
+ if constexpr (std::is_copy_assignable_v<T>) {
+ m.fill_initialized = fill_initialized_cb<T>;
+ m.fill_initialized_indices = fill_initialized_indices_cb<T>;
+ }
+ if constexpr (std::is_copy_constructible_v<T>) {
+ m.fill_uninitialized = fill_uninitialized_cb<T>;
+ m.fill_uninitialized_indices = fill_uninitialized_indices_cb<T>;
+ }
m.debug_print = debug_print_cb<T>;
m.is_equal = is_equal_cb<T>;
m.hash = hash_cb<T>;
- m.default_value = static_cast<const void *>(&default_value);
const CPPType *type = new CPPType(std::move(m));
return std::unique_ptr<const CPPType>(type);
@@ -233,9 +257,8 @@ inline std::unique_ptr<const CPPType> create_cpp_type(StringRef name, const T &d
#define MAKE_CPP_TYPE(IDENTIFIER, TYPE_NAME) \
template<> const blender::fn::CPPType &blender::fn::CPPType::get<TYPE_NAME>() \
{ \
- static TYPE_NAME default_value; \
static std::unique_ptr<const CPPType> cpp_type = blender::fn::create_cpp_type<TYPE_NAME>( \
- STRINGIFY(IDENTIFIER), default_value); \
+ STRINGIFY(IDENTIFIER)); \
return *cpp_type; \
} \
/* Support using `CPPType::get<const T>()`. Otherwise the caller would have to remove const. */ \
diff --git a/source/blender/modifiers/intern/MOD_nodes_evaluator.cc b/source/blender/modifiers/intern/MOD_nodes_evaluator.cc
index 980607db839..448abe6b5fe 100644
--- a/source/blender/modifiers/intern/MOD_nodes_evaluator.cc
+++ b/source/blender/modifiers/intern/MOD_nodes_evaluator.cc
@@ -292,14 +292,22 @@ class LockedNode : NonCopyable, NonMovable {
}
};
-static const CPPType *get_socket_cpp_type(const DSocket socket)
+static const CPPType *get_socket_cpp_type(const SocketRef &socket)
{
- return nodes::socket_cpp_type_get(*socket->typeinfo());
+ const CPPType *type = nodes::socket_cpp_type_get(*socket.typeinfo());
+ if (type == nullptr) {
+ return nullptr;
+ }
+ /* The evaluator only supports types that have special member functions. */
+ if (!type->has_special_member_functions()) {
+ return nullptr;
+ }
+ return type;
}
-static const CPPType *get_socket_cpp_type(const SocketRef &socket)
+static const CPPType *get_socket_cpp_type(const DSocket socket)
{
- return nodes::socket_cpp_type_get(*socket.typeinfo());
+ return get_socket_cpp_type(*socket.socket_ref());
}
static bool node_supports_laziness(const DNode node)
More information about the Bf-blender-cvs
mailing list