[gcc r17-3354] libstdc++: Adjust checks for expected message for mdspan negative tests.
Tomasz Kaminski
tkaminsk@gcc.gnu.org
Tue Aug 18 09:46:22 GMT 2026
https://gcc.gnu.org/g:9175c2da980b044ab2909dd3c16f0e0595791688
commit r17-3354-g9175c2da980b044ab2909dd3c16f0e0595791688
Author: Tomasz Kamiński <tkaminsk@redhat.com>
Date: Tue Aug 18 11:33:10 2026 +0200
libstdc++: Adjust checks for expected message for mdspan negative tests.
The affected cases, corresponds to use of compile know extents, and
errors corresponds to static_assertion failures, that are triggered from
instantiation ("required from"), not during evaluation ("in expansion of").
libstdc++-v3/ChangeLog:
* testsuite/23_containers/mdspan/layouts/padded_neg.cc: Adjust
message pattern for test cases using static extents.
* testsuite/23_containers/mdspan/submdspan/canonical_slices_neg.cc:
Likewise.
Diff:
---
libstdc++-v3/testsuite/23_containers/mdspan/layouts/padded_neg.cc | 8 ++++----
.../23_containers/mdspan/submdspan/canonical_slices_neg.cc | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/libstdc++-v3/testsuite/23_containers/mdspan/layouts/padded_neg.cc b/libstdc++-v3/testsuite/23_containers/mdspan/layouts/padded_neg.cc
index 4073f6838225..36d61179cf8e 100644
--- a/libstdc++-v3/testsuite/23_containers/mdspan/layouts/padded_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/mdspan/layouts/padded_neg.cc
@@ -244,8 +244,8 @@ template<template<size_t> typename Layout>
(void) m;
return true;
}
-static_assert(test_from_samepad_sta<std::layout_left_padded>()); // { dg-error "expansion of" }
-static_assert(test_from_samepad_sta<std::layout_right_padded>()); // { dg-error "expansion of" }
+static_assert(test_from_samepad_sta<std::layout_left_padded>()); // { dg-error "required from" }
+static_assert(test_from_samepad_sta<std::layout_right_padded>()); // { dg-error "required from" }
template<template<size_t> typename Layout>
constexpr bool
@@ -295,11 +295,11 @@ template<template<size_t> typename Layout, size_t RunId>
}
return true;
}
-static_assert(test_to_same_not_exhaustive<std::layout_left_padded, 0>()); // { dg-error "expansion of" }
+static_assert(test_to_same_not_exhaustive<std::layout_left_padded, 0>()); // { dg-error "required from" }
static_assert(test_to_same_not_exhaustive<std::layout_left_padded, 1>()); // { dg-error "expansion of" }
static_assert(test_to_same_not_exhaustive<std::layout_left_padded, 2>()); // { dg-error "expansion of" }
static_assert(test_to_same_not_exhaustive<std::layout_left_padded, 3>()); // { dg-error "expansion of" }
-static_assert(test_to_same_not_exhaustive<std::layout_right_padded, 0>()); // { dg-error "expansion of" }
+static_assert(test_to_same_not_exhaustive<std::layout_right_padded, 0>()); // { dg-error "required from" }
static_assert(test_to_same_not_exhaustive<std::layout_right_padded, 1>()); // { dg-error "expansion of" }
static_assert(test_to_same_not_exhaustive<std::layout_right_padded, 2>()); // { dg-error "expansion of" }
static_assert(test_to_same_not_exhaustive<std::layout_right_padded, 3>()); // { dg-error "expansion of" }
diff --git a/libstdc++-v3/testsuite/23_containers/mdspan/submdspan/canonical_slices_neg.cc b/libstdc++-v3/testsuite/23_containers/mdspan/submdspan/canonical_slices_neg.cc
index 5c61e938da5e..c1ff4275cbd6 100644
--- a/libstdc++-v3/testsuite/23_containers/mdspan/submdspan/canonical_slices_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/mdspan/submdspan/canonical_slices_neg.cc
@@ -55,11 +55,11 @@ static_assert(test_over1(5, sta_sexts)); // { dg-error "expansion of" }
static_assert(test_over1(5, sta_uexts)); // { dg-error "expansion of" }
static_assert(test_over1(std::cw<0>, dyn_empty)); // { dg-error "expansion of" }
-static_assert(test_over1(std::cw<0>, sta_empty)); // { dg-error "expansion of" }
+static_assert(test_over1(std::cw<0>, sta_empty)); // { dg-error "required from" }
static_assert(test_over1(std::cw<5>, dyn_sexts)); // { dg-error "expansion of" }
static_assert(test_over1(std::cw<5>, dyn_uexts)); // { dg-error "expansion of" }
-static_assert(test_over1(std::cw<5>, sta_sexts)); // { dg-error "expansion of" }
-static_assert(test_over1(std::cw<5>, sta_uexts)); // { dg-error "expansion of" }
+static_assert(test_over1(std::cw<5>, sta_sexts)); // { dg-error "required from" }
+static_assert(test_over1(std::cw<5>, sta_uexts)); // { dg-error "required from" }
template<typename Offset, typename Extent, typename Stride, typename Extents>
constexpr bool
More information about the Libstdc++-cvs
mailing list