Value-initialize iterator_range members iterator_range's default constructor is defaulted and leaves begin_ and end_ indeterminate, so a default-constructed range (for example LayoutItem::tokens_, a FormatTokenRange) compares indeterminate iterators in begin() != end(). That is undefined behavior: only value-initialized singular iterators may be compared. It happens to work with iterator types that value-initialize themselves, but not with libc++ hardened (bounded) iterators. Give the members default member initializers so a default-constructed range is a valid empty range, and add a test.
diff --git a/verible/common/util/iterator-range.h b/verible/common/util/iterator-range.h index f8a8e5d..be638dd 100644 --- a/verible/common/util/iterator-range.h +++ b/verible/common/util/iterator-range.h
@@ -50,8 +50,10 @@ const iterator &end() const { return end_; } private: - iterator begin_; - iterator end_; + // Value-initialized so that a default-constructed range is a valid empty + // range whose begin() and end() compare equal. + iterator begin_{}; + iterator end_{}; }; template <typename Iter>
diff --git a/verible/common/util/iterator-range_test.cc b/verible/common/util/iterator-range_test.cc index 35eb1ce..13ef0e1 100644 --- a/verible/common/util/iterator-range_test.cc +++ b/verible/common/util/iterator-range_test.cc
@@ -41,6 +41,13 @@ } } +TEST(IteratorRangeTest, DefaultConstructedIsEmpty) { + iterator_range<std::vector<int>::iterator> range; + EXPECT_EQ(range.begin(), range.end()); + const iterator_range<std::vector<int>::const_iterator> crange; + EXPECT_EQ(crange.begin(), crange.end()); +} + TEST(IteratorRangeTest, EmptyVectorRangeComparison) { std::vector<int> v; {