diff options
author | François Dumont <fdumont@gcc.gnu.org> | 2021-08-08 18:52:19 +0200 |
---|---|---|
committer | François Dumont <fdumont@gcc.gnu.org> | 2021-08-08 19:12:22 +0200 |
commit | ad9c394114bbd1136b9a0288aea2132366ba46ca (patch) | |
tree | f01efa21d98b110c4fcc4fc6f72ff8114cce03a7 | |
parent | fd26ce83981c6b50519805500272ab26b4e4c4b0 (diff) | |
download | gcc-ad9c394114bbd1136b9a0288aea2132366ba46ca.zip gcc-ad9c394114bbd1136b9a0288aea2132366ba46ca.tar.gz gcc-ad9c394114bbd1136b9a0288aea2132366ba46ca.tar.bz2 |
libstdc++: Fix dg-prune-output assertion message
Since __glibcxx_assert changes in r6b42b5a the generated assertion message
has changed.
libstdc++-v3/ChangeLog:
* testsuite/25_algorithms/copy/debug/constexpr_neg.cc: Replace 'failed_assertion'
dg-prune-output reason with 'builtin_unreachable'.
* 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.
9 files changed, 9 insertions, 9 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 d8d2091..4f32403 100644 --- a/libstdc++-v3/testsuite/25_algorithms/copy/debug/constexpr_neg.cc +++ b/libstdc++-v3/testsuite/25_algorithms/copy/debug/constexpr_neg.cc @@ -49,5 +49,5 @@ test2() static_assert(test2()); // { dg-error "is outside the bounds" } // { dg-prune-output "in 'constexpr' expansion" } -// { dg-prune-output "failed_assertion" } +// { dg-prune-output "builtin_unreachable" } // { dg-prune-output "non-constant condition" } 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 8433a8f..05183cf 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 @@ -37,4 +37,4 @@ test() static_assert(test()); // { dg-error "non-constant condition" } // { dg-prune-output "in 'constexpr' expansion" } -// { dg-prune-output "failed_assertion" } +// { dg-prune-output "builtin_unreachable" } 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 3716212..44f9fb9 100644 --- a/libstdc++-v3/testsuite/25_algorithms/equal/debug/constexpr_neg.cc +++ b/libstdc++-v3/testsuite/25_algorithms/equal/debug/constexpr_neg.cc @@ -48,4 +48,4 @@ static_assert(test02()); // { dg-error "outside the bounds" } // { dg-prune-output "non-constant condition" } // { dg-prune-output "in 'constexpr'" } -// { dg-prune-output "failed_assertion" } +// { dg-prune-output "builtin_unreachable" } 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 3536e64..56d80d6 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 @@ -44,5 +44,5 @@ test() static_assert(test()); // { dg-error "" } -// { dg-prune-output "failed_assertion" } +// { dg-prune-output "builtin_unreachable" } // { 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 ecda3f5..ab931bb 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 @@ -34,5 +34,5 @@ test() static_assert(test()); // { dg-error "" } -// { dg-prune-output "failed_assertion" } +// { dg-prune-output "builtin_unreachable" } // { dg-prune-output "in 'constexpr'" } 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 e719543..fee67e5 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 @@ -47,6 +47,6 @@ test2() static_assert(test2()); // { dg-error "" } -// { dg-prune-output "failed_assertion" } +// { dg-prune-output "builtin_unreachable" } // { dg-prune-output "in 'constexpr'" } 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 04d6f73..7937ac8 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 @@ -44,5 +44,5 @@ test() static_assert(test()); // { dg-error "" } -// { dg-prune-output "failed_assertion" } +// { dg-prune-output "builtin_unreachable" } // { dg-prune-output "in 'constexpr'" } 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 7d2ef73..7d33eb5 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 @@ -34,5 +34,5 @@ test() static_assert(test()); // { dg-error "" } -// { dg-prune-output "failed_assertion" } +// { dg-prune-output "builtin_unreachable" } // { dg-prune-output "in 'constexpr'" } 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 33a09b7..9c2d065 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 @@ -47,5 +47,5 @@ test2() static_assert(test2()); // { dg-error "" } -// { dg-prune-output "failed_assertion" } +// { dg-prune-output "builtin_unreachable" } // { dg-prune-output "in 'constexpr'" } |