Tested x86_64-linux. Pushed to trunk.
-- >8 --
We no longer hit a __builtin_unreachable() in these tests, so we need to
update the dg-error patterns to match _Error_formatter::_M_error().
We can also remove some dg-prune-output directives matching notes saying
"in 'constexpr' expansion" because that's done globally in prune.exp.
libstdc++-v3/ChangeLog:
* testsuite/25_algorithms/copy/debug/constexpr_neg.cc: Adjust
dg-error pattern.
* testsuite/25_algorithms/copy_backward/debug/constexpr_neg.cc:
Likewise.
* testsuite/25_algorithms/equal/debug/constexpr_neg.cc:
Likewise.
*
testsuite/25_algorithms/lower_bound/debug/constexpr_partitioned_neg.cc:
Likewise.
*
testsuite/25_algorithms/lower_bound/debug/constexpr_partitioned_pred_neg.cc:
Likewise.
*
testsuite/25_algorithms/lower_bound/debug/constexpr_valid_range_neg.cc:
Likewise.
*
testsuite/25_algorithms/upper_bound/debug/constexpr_partitioned_neg.cc:
Likewise.
*
testsuite/25_algorithms/upper_bound/debug/constexpr_partitioned_pred_neg.cc:
Likewise.
*
testsuite/25_algorithms/upper_bound/debug/constexpr_valid_range_neg.cc:
Likewise.
---
.../testsuite/25_algorithms/copy/debug/constexpr_neg.cc | 2 +-
.../25_algorithms/copy_backward/debug/constexpr_neg.cc | 3 +--
.../testsuite/25_algorithms/equal/debug/constexpr_neg.cc | 2 +-
.../lower_bound/debug/constexpr_partitioned_neg.cc | 2 +-
.../lower_bound/debug/constexpr_partitioned_pred_neg.cc | 3 +--
.../lower_bound/debug/constexpr_valid_range_neg.cc | 3 +--
.../upper_bound/debug/constexpr_partitioned_neg.cc | 3 +--
.../upper_bound/debug/constexpr_partitioned_pred_neg.cc | 3 +--
.../upper_bound/debug/constexpr_valid_range_neg.cc | 3 +--
9 files changed, 9 insertions(+), 15 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 2922d1ab1f9..6ae37b87ac5 100644
--- a/libstdc++-v3/testsuite/25_algorithms/copy/debug/constexpr_neg.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/copy/debug/constexpr_neg.cc
@@ -33,7 +33,7 @@ test1()
}
static_assert(test1()); // { dg-error "non-constant condition" }
-// { dg-error "builtin_unreachable" "" { target *-*-* } 0 }
+// { dg-error "_Error_formatter::_M_error()" "" { target *-*-* } 0 }
constexpr bool
test2()
diff --git
a/libstdc++-v3/testsuite/25_algorithms/copy_backward/debug/constexpr_neg.cc
b/libstdc++-v3/testsuite/25_algorithms/copy_backward/debug/constexpr_neg.cc
index 4b55b835ab4..52259aa50aa 100644
--- a/libstdc++-v3/testsuite/25_algorithms/copy_backward/debug/constexpr_neg.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/copy_backward/debug/constexpr_neg.cc
@@ -35,5 +35,4 @@ test()
static_assert(test()); // { dg-error "non-constant condition" }
-// { dg-prune-output "in 'constexpr' expansion" }
-// { dg-prune-output "builtin_unreachable" }
+// { dg-prune-output "_Error_formatter::_M_error()" }
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 8fb225ecc85..82ec49c6f40 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,7 @@ test01()
}
static_assert(test01()); // { dg-error "non-constant condition" }
-// { dg-error "builtin_unreachable" "" { target *-*-* } 0 }
+// { dg-error "_Error_formatter::_M_error()" "" { target *-*-* } 0 }
constexpr bool
test02()
diff --git
a/libstdc++-v3/testsuite/25_algorithms/lower_bound/debug/constexpr_partitioned_neg.cc
b/libstdc++-v3/testsuite/25_algorithms/lower_bound/debug/constexpr_partitioned_neg.cc
index 184ae22ae24..8c2819d0554 100644
---
a/libstdc++-v3/testsuite/25_algorithms/lower_bound/debug/constexpr_partitioned_neg.cc
+++
b/libstdc++-v3/testsuite/25_algorithms/lower_bound/debug/constexpr_partitioned_neg.cc
@@ -43,5 +43,5 @@ test()
static_assert(test()); // { dg-error "" }
-// { dg-prune-output "builtin_unreachable" }
+// { dg-prune-output "_Error_formatter::_M_error()" }
// { dg-prune-output "in 'constexpr'" }
diff --git
a/libstdc++-v3/testsuite/25_algorithms/lower_bound/debug/constexpr_partitioned_pred_neg.cc
b/libstdc++-v3/testsuite/25_algorithms/lower_bound/debug/constexpr_partitioned_pred_neg.cc
index f7b2b7231d9..ab27cb17fb1 100644
---
a/libstdc++-v3/testsuite/25_algorithms/lower_bound/debug/constexpr_partitioned_pred_neg.cc
+++
b/libstdc++-v3/testsuite/25_algorithms/lower_bound/debug/constexpr_partitioned_pred_neg.cc
@@ -33,5 +33,4 @@ test()
static_assert(test()); // { dg-error "" }
-// { dg-prune-output "builtin_unreachable" }
-// { dg-prune-output "in 'constexpr'" }
+// { dg-prune-output "_Error_formatter::_M_error()" }
diff --git
a/libstdc++-v3/testsuite/25_algorithms/lower_bound/debug/constexpr_valid_range_neg.cc
b/libstdc++-v3/testsuite/25_algorithms/lower_bound/debug/constexpr_valid_range_neg.cc
index 6996950d686..9fd3bcc070d 100644
---
a/libstdc++-v3/testsuite/25_algorithms/lower_bound/debug/constexpr_valid_range_neg.cc
+++
b/libstdc++-v3/testsuite/25_algorithms/lower_bound/debug/constexpr_valid_range_neg.cc
@@ -46,6 +46,5 @@ test2()
static_assert(test2()); // { dg-error "" }
-// { dg-prune-output "builtin_unreachable" }
-// { dg-prune-output "in 'constexpr'" }
+// { dg-prune-output "_Error_formatter::_M_error()" }
diff --git
a/libstdc++-v3/testsuite/25_algorithms/upper_bound/debug/constexpr_partitioned_neg.cc
b/libstdc++-v3/testsuite/25_algorithms/upper_bound/debug/constexpr_partitioned_neg.cc
index b4e56df9174..c1ee761f51e 100644
---
a/libstdc++-v3/testsuite/25_algorithms/upper_bound/debug/constexpr_partitioned_neg.cc
+++
b/libstdc++-v3/testsuite/25_algorithms/upper_bound/debug/constexpr_partitioned_neg.cc
@@ -43,5 +43,4 @@ test()
static_assert(test()); // { dg-error "" }
-// { dg-prune-output "builtin_unreachable" }
-// { dg-prune-output "in 'constexpr'" }
+// { dg-prune-output "_Error_formatter::_M_error()" }
diff --git
a/libstdc++-v3/testsuite/25_algorithms/upper_bound/debug/constexpr_partitioned_pred_neg.cc
b/libstdc++-v3/testsuite/25_algorithms/upper_bound/debug/constexpr_partitioned_pred_neg.cc
index 1ffeb326bfc..85fcde40b37 100644
---
a/libstdc++-v3/testsuite/25_algorithms/upper_bound/debug/constexpr_partitioned_pred_neg.cc
+++
b/libstdc++-v3/testsuite/25_algorithms/upper_bound/debug/constexpr_partitioned_pred_neg.cc
@@ -33,5 +33,4 @@ test()
static_assert(test()); // { dg-error "" }
-// { dg-prune-output "builtin_unreachable" }
-// { dg-prune-output "in 'constexpr'" }
+// { dg-prune-output "_Error_formatter::_M_error()" }
diff --git
a/libstdc++-v3/testsuite/25_algorithms/upper_bound/debug/constexpr_valid_range_neg.cc
b/libstdc++-v3/testsuite/25_algorithms/upper_bound/debug/constexpr_valid_range_neg.cc
index 5b0e651d077..446073c314b 100644
---
a/libstdc++-v3/testsuite/25_algorithms/upper_bound/debug/constexpr_valid_range_neg.cc
+++
b/libstdc++-v3/testsuite/25_algorithms/upper_bound/debug/constexpr_valid_range_neg.cc
@@ -46,5 +46,4 @@ test2()
static_assert(test2()); // { dg-error "" }
-// { dg-prune-output "builtin_unreachable" }
-// { dg-prune-output "in 'constexpr'" }
+// { dg-prune-output "_Error_formatter::_M_error()" }
--
2.43.0
