diff --git a/esphome/components/sensor/filter.h b/esphome/components/sensor/filter.h index 9c45443cdc..3c251982e7 100644 --- a/esphome/components/sensor/filter.h +++ b/esphome/components/sensor/filter.h @@ -474,13 +474,7 @@ optional 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 class OrFilter : public Filter { public: - explicit OrFilter(std::initializer_list filters) { - ESPHOME_DEBUG_ASSERT(filters.size() == N); - size_t i = 0; - for (auto *f : filters) { - this->filters_[i++] = f; - } - } + explicit OrFilter(std::initializer_list filters) { init_array_from(this->filters_, filters); } void initialize(Sensor *parent, Filter *next) override { Filter::initialize(parent, next); diff --git a/esphome/core/helpers.h b/esphome/core/helpers.h index 82c6b3833c..51feaa57c5 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