[libcxx-commits] [libcxx] 20b538f - [libc++] Addresses LWG3103.
Mark de Wever via libcxx-commits
libcxx-commits at lists.llvm.org
Sat Mar 4 04:24:51 PST 2023
Author: Mark de Wever
Date: 2023-03-04T13:24:44+01:00
New Revision: 20b538fc641e92b1f61f7fe1278a02bdacd613cb
URL: https://github.com/llvm/llvm-project/commit/20b538fc641e92b1f61f7fe1278a02bdacd613cb
DIFF: https://github.com/llvm/llvm-project/commit/20b538fc641e92b1f61f7fe1278a02bdacd613cb.diff
LOG: [libc++] Addresses LWG3103.
LWG3103 Errors in taking subview of span should be ill-formed where possible
Note that the real work was already done before, including tests.
Reviewed By: #libc, ldionne
Differential Revision: https://reviews.llvm.org/D143432
Added:
Modified:
libcxx/docs/Status/Cxx20Issues.csv
libcxx/test/std/containers/views/views.span/span.sub/first.pass.cpp
libcxx/test/std/containers/views/views.span/span.sub/first.verify.cpp
libcxx/test/std/containers/views/views.span/span.sub/last.pass.cpp
libcxx/test/std/containers/views/views.span/span.sub/last.verify.cpp
libcxx/test/std/containers/views/views.span/span.sub/subspan.pass.cpp
libcxx/test/std/containers/views/views.span/span.sub/subspan.verify.cpp
Removed:
################################################################################
diff --git a/libcxx/docs/Status/Cxx20Issues.csv b/libcxx/docs/Status/Cxx20Issues.csv
index 0b03c3536e084..c2cee7e88b83a 100644
--- a/libcxx/docs/Status/Cxx20Issues.csv
+++ b/libcxx/docs/Status/Cxx20Issues.csv
@@ -183,7 +183,7 @@
"`3266 <https://wg21.link/LWG3266>`__","``to_chars(bool)``\ should be deleted","Belfast","|Complete|","14.0"
"`3272 <https://wg21.link/LWG3272>`__","``%I%p``\ should parse/format ``duration``\ since midnight","Belfast","","","|chrono| |format|"
"`3259 <https://wg21.link/LWG3259>`__","The definition of *constexpr iterators* should be adjusted","Belfast","|Nothing To Do|",""
-"`3103 <https://wg21.link/LWG3103>`__","Errors in taking subview of ``span``\ should be ill-formed where possible","Belfast","",""
+"`3103 <https://wg21.link/LWG3103>`__","Errors in taking subview of ``span``\ should be ill-formed where possible","Belfast","11.0","|Complete|"
"`3274 <https://wg21.link/LWG3274>`__","Missing feature test macro for ``<span>``\ ","Belfast","|Complete|","11.0"
"`3276 <https://wg21.link/LWG3276>`__","Class ``split_view::outer_iterator::value_type``\ should inherit from ``view_interface``\ ","Belfast","|Complete|","15.0","|ranges|"
"`3277 <https://wg21.link/LWG3277>`__","Pre-increment on prvalues is not a requirement of ``weakly_incrementable``\ ","Belfast","|Nothing To Do|","","|ranges|"
diff --git a/libcxx/test/std/containers/views/views.span/span.sub/first.pass.cpp b/libcxx/test/std/containers/views/views.span/span.sub/first.pass.cpp
index 2b04cb0f71595..37baea2c7c34a 100644
--- a/libcxx/test/std/containers/views/views.span/span.sub/first.pass.cpp
+++ b/libcxx/test/std/containers/views/views.span/span.sub/first.pass.cpp
@@ -14,8 +14,7 @@
//
// constexpr span<element_type, dynamic_extent> first(size_type count) const;
//
-// Requires: Count <= size().
-
+// Mandates: Count <= Extent is true.
#include <span>
#include <cassert>
diff --git a/libcxx/test/std/containers/views/views.span/span.sub/first.verify.cpp b/libcxx/test/std/containers/views/views.span/span.sub/first.verify.cpp
index 8e011b55bc497..39d04b0e12253 100644
--- a/libcxx/test/std/containers/views/views.span/span.sub/first.verify.cpp
+++ b/libcxx/test/std/containers/views/views.span/span.sub/first.verify.cpp
@@ -12,7 +12,7 @@
// template<size_t Count>
// constexpr span<element_type, Count> first() const;
//
-// Requires: Count <= size().
+// Mandates: Count <= Extent is true.
#include <span>
#include <cstddef>
diff --git a/libcxx/test/std/containers/views/views.span/span.sub/last.pass.cpp b/libcxx/test/std/containers/views/views.span/span.sub/last.pass.cpp
index 6fa6edfc7e593..1cddaa15952cf 100644
--- a/libcxx/test/std/containers/views/views.span/span.sub/last.pass.cpp
+++ b/libcxx/test/std/containers/views/views.span/span.sub/last.pass.cpp
@@ -14,8 +14,7 @@
//
// constexpr span<element_type, dynamic_extent> last(size_type count) const;
//
-// Requires: Count <= size().
-
+// Mandates: Count <= Extent is true.
#include <span>
#include <cassert>
diff --git a/libcxx/test/std/containers/views/views.span/span.sub/last.verify.cpp b/libcxx/test/std/containers/views/views.span/span.sub/last.verify.cpp
index 1594e68d0258b..9fc6deb87a0fa 100644
--- a/libcxx/test/std/containers/views/views.span/span.sub/last.verify.cpp
+++ b/libcxx/test/std/containers/views/views.span/span.sub/last.verify.cpp
@@ -12,7 +12,7 @@
// template<size_t Count>
// constexpr span<element_type, Count> last() const;
//
-// Requires: Count <= size().
+// Mandates: Count <= Extent is true.
#include <span>
#include <cstddef>
diff --git a/libcxx/test/std/containers/views/views.span/span.sub/subspan.pass.cpp b/libcxx/test/std/containers/views/views.span/span.sub/subspan.pass.cpp
index f426ab633861c..bc5731396699b 100644
--- a/libcxx/test/std/containers/views/views.span/span.sub/subspan.pass.cpp
+++ b/libcxx/test/std/containers/views/views.span/span.sub/subspan.pass.cpp
@@ -15,8 +15,7 @@
// constexpr span<element_type, dynamic_extent> subspan(
// size_type offset, size_type count = dynamic_extent) const;
//
-// Requires: (0 <= Offset && Offset <= size())
-// && (Count == dynamic_extent || Count >= 0 && Offset + Count <= size())
+// Mandates: Offset <= Extent && (Count == dynamic_extent || Count <= Extent - Offset) is true.
#include <span>
#include <cassert>
diff --git a/libcxx/test/std/containers/views/views.span/span.sub/subspan.verify.cpp b/libcxx/test/std/containers/views/views.span/span.sub/subspan.verify.cpp
index 1e58162febf05..e74674e800fff 100644
--- a/libcxx/test/std/containers/views/views.span/span.sub/subspan.verify.cpp
+++ b/libcxx/test/std/containers/views/views.span/span.sub/subspan.verify.cpp
@@ -16,8 +16,7 @@
// template<size_t Offset, size_t Count = dynamic_extent>
// constexpr span<element_type, see below> subspan() const;
//
-// Requires: offset <= size() &&
-// (count == dynamic_extent || count <= size() - offset)
+// Mandates: Offset <= Extent && (Count == dynamic_extent || Count <= Extent - Offset) is true.
#include <span>
#include <cstddef>
More information about the libcxx-commits
mailing list