From 8b42629e3ebbe7df8471d54a6052a0adddbd0b5a Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Fri, 27 Mar 2026 16:14:53 -1000 Subject: [PATCH] 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. --- esphome/components/binary_sensor/filter.h | 6 +----- esphome/core/helpers.h | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/esphome/components/binary_sensor/filter.h b/esphome/components/binary_sensor/filter.h index d308c375b03..37c6bf0092c 100644 --- a/esphome/components/binary_sensor/filter.h +++ b/esphome/components/binary_sensor/filter.h @@ -112,11 +112,7 @@ class AutorepeatFilterBase : public Filter, public Component { template class AutorepeatFilter : public AutorepeatFilterBase { public: explicit AutorepeatFilter(std::initializer_list timings) { - ESPHOME_DEBUG_ASSERT(timings.size() == N); - size_t i = 0; - for (const auto &t : timings) { - this->timings_storage_[i++] = t; - } + init_array_from(this->timings_storage_, timings); this->timings_ = this->timings_storage_.data(); this->timings_count_ = N; } diff --git a/esphome/core/helpers.h b/esphome/core/helpers.h index 82c6b3833ce..51feaa57c50 100644 --- a/esphome/core/helpers.h +++ b/esphome/core/helpers.h @@ -497,6 +497,21 @@ template::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 inline void init_array_from(std::array &dest, std::initializer_list src) { + ESPHOME_DEBUG_ASSERT(src.size() == N); + if constexpr (std::is_trivially_copyable_v) { + __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