Tested x86_64-linux. Pushed to trunk. -- >8 --
These tests started failing at some point: FAIL: 25_algorithms/copy/debug/constexpr_neg.cc (test for errors, line 49) FAIL: 25_algorithms/copy/debug/constexpr_neg.cc (test for excess errors) FAIL: 25_algorithms/equal/debug/constexpr_neg.cc (test for errors, line 47) FAIL: 25_algorithms/equal/debug/constexpr_neg.cc (test for excess errors) They only run with -D_GLIBCXX_DEBUG or make check-debug so seem to have gone unnoticed until now. libstdc++-v3/ChangeLog: * testsuite/25_algorithms/copy/debug/constexpr_neg.cc: Adjust expected errors. * testsuite/25_algorithms/equal/debug/constexpr_neg.cc: Likewise. --- .../25_algorithms/copy/debug/constexpr_neg.cc | 8 +++----- .../25_algorithms/equal/debug/constexpr_neg.cc | 10 ++++------ 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/libstdc++-v3/testsuite/25_algorithms/copy/debug/constexpr_neg.cc b/libstdc++-v3/testsuite/25_algorithms/copy/debug/constexpr_neg.cc index 6981c470666..bf3c4939bfb 100644 --- a/libstdc++-v3/testsuite/25_algorithms/copy/debug/constexpr_neg.cc +++ b/libstdc++-v3/testsuite/25_algorithms/copy/debug/constexpr_neg.cc @@ -34,6 +34,7 @@ test1() } static_assert(test1()); // { dg-error "non-constant condition" } +// { dg-error "builtin_unreachable" "" { target *-*-* } 0 } constexpr bool test2() @@ -46,8 +47,5 @@ test2() return out6 == ma0.begin() + 18; } -static_assert(test2()); // { dg-error "is outside the bounds" } - -// { dg-prune-output "in 'constexpr' expansion" } -// { dg-prune-output "builtin_unreachable" } -// { dg-prune-output "non-constant condition" } +static_assert(test2()); // { dg-error "non-constant condition" } +// { dg-error "is outside the bounds" "" { target *-*-* } 0 } diff --git a/libstdc++-v3/testsuite/25_algorithms/equal/debug/constexpr_neg.cc b/libstdc++-v3/testsuite/25_algorithms/equal/debug/constexpr_neg.cc index bb613bef03b..f5e46e58e49 100644 --- a/libstdc++-v3/testsuite/25_algorithms/equal/debug/constexpr_neg.cc +++ b/libstdc++-v3/testsuite/25_algorithms/equal/debug/constexpr_neg.cc @@ -32,7 +32,8 @@ test01() return outa; } -static_assert(test01()); // { dg-error } +static_assert(test01()); // { dg-error "non-constant condition" } +// { dg-error "builtin_unreachable" "" { target *-*-* } 0 } constexpr bool test02() @@ -44,8 +45,5 @@ test02() return outa; } -static_assert(test02()); // { dg-error "outside the bounds" } - -// { dg-prune-output "non-constant condition" } -// { dg-prune-output "in 'constexpr'" } -// { dg-prune-output "builtin_unreachable" } +static_assert(test02()); // { dg-error "non-constant condition" } +// { dg-error "is outside the bounds" "" { target *-*-* } 0 } -- 2.41.0