diff mbox series

[committed] Fix dg-prune-output

Message ID bff2367d-5261-37f3-35cf-fc5c1a39020b@gmail.com
State New
Headers show
Series [committed] Fix dg-prune-output | expand

Commit Message

François Dumont Aug. 8, 2021, 7:25 p.m. UTC 
This is a trivial fix following a recent change on __glibcxx_assert.

     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.

François

Comments

Jonathan Wakely Aug. 8, 2021, 8:54 p.m. UTC | #1 
On Sun, 8 Aug 2021, 20:26 François Dumont via Libstdc++, <
libstdc++@gcc.gnu.org> wrote:

> This is a trivial fix following a recent change on __glibcxx_assert.
>
>      libstdc++: Fix dg-prune-output assertion message
>
>      Since __glibcxx_assert changes in r6b42b5a the generated assertion
> message
>      has changed.
>

Ah yes, thanks for fixing this.



>      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.
>
> François
>
>
diff mbox series

Patch

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 d8d2091d36e..4f324038a10 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 8433a8fc411..05183cff16a 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 37162127e3f..44f9fb970d8 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 3536e64c00c..56d80d61ae2 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 ecda3f5c5da..ab931bbc731 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 e7195438552..fee67e52172 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 04d6f73a9ac..7937ac8d308 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 7d2ef738c83..7d33eb535fa 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 33a09b73bca..9c2d0657208 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'" }