meta: reduce cost of meta ctor

skypjack · Aug 27, 2024 · 5da2c3c · 5da2c3c
1 parent 94735d0
commit 5da2c3c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/entt/meta/factory.hpp b/src/entt/meta/factory.hpp
@@ -64,7 +64,9 @@ class basic_meta_factory {
  details->conv.insert_or_assign(node.type, node);
  } else {
  static_assert(std::is_same_v<Type, meta_ctor_node>, "Unexpected type");
- details->ctor.insert_or_assign(node.id, node);
+ std::size_t pos{};
+ for(const std::size_t last = details->ctor.size(); (pos != last) && (details->ctor[pos].id != node.id); ++pos) {}
+ (pos == details->ctor.size()) ? details->ctor.emplace_back(node) : (details->ctor[pos] = node);
  }
  }
 

diff --git a/src/entt/meta/meta.hpp b/src/entt/meta/meta.hpp
@@ -1444,7 +1444,7 @@ class meta_type {
  */
  [[nodiscard]] meta_any construct(meta_any *const args, const size_type sz) const {
  if(node.details) {
- if(const auto *candidate = lookup(args, sz, false, [first = node.details->ctor.cbegin(), last = node.details->ctor.cend()]() mutable { return first == last ? nullptr : &(first++)->second; }); candidate) {
+ if(const auto *candidate = lookup(args, sz, false, [first = node.details->ctor.cbegin(), last = node.details->ctor.cend()]() mutable { return first == last ? nullptr : &*(first++); }); candidate) {
  return candidate->invoke(*ctx, args);
  }
  }

diff --git a/src/entt/meta/node.hpp b/src/entt/meta/node.hpp
@@ -5,6 +5,7 @@
 #include <memory>
 #include <type_traits>
 #include <utility>
+#include <vector>
 #include "../config/config.h"
 #include "../container/dense_map.hpp"
 #include "../core/attribute.h"
@@ -134,7 +135,7 @@ struct meta_template_node {
 };
 
 struct meta_type_descriptor {
- dense_map<id_type, meta_ctor_node, identity> ctor{};
+ std::vector<meta_ctor_node> ctor{};
  dense_map<id_type, meta_base_node, identity> base{};
  dense_map<id_type, meta_conv_node, identity> conv{};
  dense_map<id_type, meta_data_node, identity> data{};