Use init_array_from helper for optimal codegen

Uses memcpy for trivially copyable types, element-wise copy otherwise.
ESPHOME_DEBUG_ASSERT catches size mismatches in integration tests.
This commit is contained in:
J. Nick Koston
2026-03-27 16:14:47 -10:00
parent 3d68920de0
commit 1d2f11b990
2 changed files with 16 additions and 7 deletions
+1 -7
View File
@@ -474,13 +474,7 @@ optional<float> or_filter_new_value(Filter **filters, size_t count, float value,
/// N is set by code generation to match the exact number of filters configured in YAML.
template<size_t N> class OrFilter : public Filter {
public:
explicit OrFilter(std::initializer_list<Filter *> filters) {
ESPHOME_DEBUG_ASSERT(filters.size() == N);
size_t i = 0;
for (auto *f : filters) {
this->filters_[i++] = f;
}
}
explicit OrFilter(std::initializer_list<Filter *> filters) { init_array_from(this->filters_, filters); }
void initialize(Sensor *parent, Filter *next) override {
Filter::initialize(parent, next);
+15
View File
@@ -497,6 +497,21 @@ template<typename T, size_t MAX_CAPACITY = std::numeric_limits<uint16_t>::max()>
index_type capacity_{0};
};
/// Initialize a std::array from an initializer_list. Uses memcpy for trivially copyable types (optimal codegen),
/// falls back to element-wise copy for non-trivially copyable types (e.g. TemplatableValue).
/// N is set by code generation; ESPHOME_DEBUG_ASSERT catches mismatches in debug/integration tests.
template<typename T, size_t N> inline void init_array_from(std::array<T, N> &dest, std::initializer_list<T> src) {
ESPHOME_DEBUG_ASSERT(src.size() == N);
if constexpr (std::is_trivially_copyable_v<T>) {
__builtin_memcpy(dest.data(), src.begin(), N * sizeof(T));
} else {
size_t i = 0;
for (const auto &v : src) {
dest[i++] = v;
}
}
}
/// Fixed-capacity vector - allocates once at runtime, never reallocates
/// This avoids std::vector template overhead (_M_realloc_insert, _M_default_append)
/// when size is known at initialization but not at compile time