From 917f8d5effd03cbd3726ce0711b21a0a26b8aa6d Mon Sep 17 00:00:00 2001 From: roytam1 Date: Fri, 27 Feb 2026 07:16:51 +0800 Subject: [PATCH] import from UXP: [MFBT] Reduce size() calls in subspan. (8bc63bff) --- mfbt/Span.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/mfbt/Span.h b/mfbt/Span.h index f031a928b..0fec61008 100644 --- a/mfbt/Span.h +++ b/mfbt/Span.h @@ -649,10 +649,11 @@ public: template MOZ_SPAN_GCC_CONSTEXPR Span Subspan() const { - MOZ_RELEASE_ASSERT(Offset <= size() && - (Count == dynamic_extent || (Offset + Count <= size()))); + const size_t len = size(); + MOZ_RELEASE_ASSERT(Offset <= len && + (Count == dynamic_extent || (Count <= len - Offset))); return { data() + Offset, - Count == dynamic_extent ? size() - Offset : Count }; + Count == dynamic_extent ? len - Offset : Count }; } /** @@ -682,11 +683,11 @@ public: index_type aStart, index_type aLength = dynamic_extent) const { - MOZ_RELEASE_ASSERT(aStart <= size() && - (aLength == dynamic_extent || - (aStart + aLength <= size()))); + const size_t len = size(); + MOZ_RELEASE_ASSERT(aStart <= len && + (aLength == dynamic_extent || (aLength <= len - aStart))); return { data() + aStart, - aLength == dynamic_extent ? size() - aStart : aLength }; + aLength == dynamic_extent ? len - aStart : aLength }; } /**