Preserve const element type in absl::MakeConstSpan on mutable views. PiperOrigin-RevId: 1023685099
diff --git a/absl/types/span.h b/absl/types/span.h index 41aba0a..96cbef2 100644 --- a/absl/types/span.h +++ b/absl/types/span.h
@@ -791,16 +791,18 @@ template <int&... ExplicitArgumentBarrier, typename C> constexpr auto MakeConstSpan(const C& c) noexcept - -> std::enable_if_t<span_internal::IsView<C>::value, - decltype(MakeSpan(c))> { - return MakeSpan(c); + -> std::enable_if_t< + span_internal::IsView<C>::value, + decltype(absl::MakeConstSpan(span_internal::GetData(c), c.size()))> { + return MakeConstSpan(span_internal::GetData(c), c.size()); } template <int&... ExplicitArgumentBarrier, typename C> constexpr auto MakeConstSpan(const C& c ABSL_ATTRIBUTE_LIFETIME_BOUND) noexcept - -> std::enable_if_t<!span_internal::IsView<C>::value, - decltype(MakeSpan(c))> { - return MakeSpan(c); + -> std::enable_if_t< + !span_internal::IsView<C>::value, + decltype(absl::MakeConstSpan(span_internal::GetData(c), c.size()))> { + return MakeConstSpan(span_internal::GetData(c), c.size()); } template <int&... ExplicitArgumentBarrier, typename T, size_t N>
diff --git a/absl/types/span_test.cc b/absl/types/span_test.cc index 57cbb99..2e27d0f 100644 --- a/absl/types/span_test.cc +++ b/absl/types/span_test.cc
@@ -463,8 +463,15 @@ const int carray[] = {0}; int* ptr = array; const int* cptr = carray; + int* ptr_array[] = {ptr}; std::string s = ""; std::string cs = ""; + absl::Span<int> mutable_span(vec); + const absl::Span<int> const_mutable_span(vec); + absl::Span<const int> const_span(cvec); + absl::Span<int*> ptr_span(ptr_array); + ContainerWithShallowConstData shallow_container{MakeRamp(3)}; + const ContainerWithShallowConstData const_shallow_container{MakeRamp(3)}; CheckType<absl::Span<const int>>(absl::MakeConstSpan(vec)); CheckType<absl::Span<const int>>(absl::MakeConstSpan(cvec)); CheckType<absl::Span<const int>>(absl::MakeConstSpan(ptr, ptr + 1)); @@ -475,6 +482,14 @@ CheckType<absl::Span<const int>>(absl::MakeConstSpan(carray)); CheckType<absl::Span<const char>>(absl::MakeConstSpan(s)); CheckType<absl::Span<const char>>(absl::MakeConstSpan(cs)); + CheckType<absl::Span<const int>>(absl::MakeConstSpan(mutable_span)); + CheckType<absl::Span<const int>>(absl::MakeConstSpan(const_mutable_span)); + CheckType<absl::Span<const int>>(absl::MakeConstSpan(const_span)); + CheckType<absl::Span<const int>>(absl::MakeConstSpan(absl::Span<int>(array))); + CheckType<absl::Span<int* const>>(absl::MakeConstSpan(ptr_span)); + CheckType<absl::Span<const int>>(absl::MakeConstSpan(shallow_container)); + CheckType<absl::Span<const int>>( + absl::MakeConstSpan(const_shallow_container)); } TEST(IntSpan, Equality) { @@ -772,6 +787,7 @@ EXPECT_TRUE(noexcept(absl::MakeConstSpan(a, a + 1))); absl::Span<int> s(v); + EXPECT_TRUE(noexcept(absl::MakeConstSpan(s))); EXPECT_TRUE(noexcept(s.data())); EXPECT_TRUE(noexcept(s.size())); EXPECT_TRUE(noexcept(s.length()));