https://gcc.gnu.org/g:c743c1cc0ab9f188c2723815591420040727cf54

commit r16-2260-gc743c1cc0ab9f188c2723815591420040727cf54
Author: Jonathan Wakely <jwak...@redhat.com>
Date:   Fri Jul 11 23:49:05 2025 +0100

    libstdc++: Tweak dg-error patterns for C++26 constexpr changes
    
    libstdc++-v3/ChangeLog:
    
            * testsuite/25_algorithms/copy/debug/constexpr_neg.cc:
            * testsuite/25_algorithms/copy_backward/debug/constexpr_neg.cc:
            * testsuite/25_algorithms/equal/debug/constexpr_neg.cc:
            * 
testsuite/25_algorithms/lower_bound/debug/constexpr_partitioned_neg.cc:
            * 
testsuite/25_algorithms/lower_bound/debug/constexpr_partitioned_pred_neg.cc:
            * 
testsuite/25_algorithms/lower_bound/debug/constexpr_valid_range_neg.cc:
            * 
testsuite/25_algorithms/upper_bound/debug/constexpr_partitioned_neg.cc:
            * 
testsuite/25_algorithms/upper_bound/debug/constexpr_partitioned_pred_neg.cc:
            * 
testsuite/25_algorithms/upper_bound/debug/constexpr_valid_range_neg.cc:

Diff:
---
 libstdc++-v3/testsuite/25_algorithms/copy/debug/constexpr_neg.cc        | 2 +-
 .../testsuite/25_algorithms/copy_backward/debug/constexpr_neg.cc        | 2 +-
 libstdc++-v3/testsuite/25_algorithms/equal/debug/constexpr_neg.cc       | 2 +-
 .../25_algorithms/lower_bound/debug/constexpr_partitioned_neg.cc        | 2 +-
 .../25_algorithms/lower_bound/debug/constexpr_partitioned_pred_neg.cc   | 2 +-
 .../25_algorithms/lower_bound/debug/constexpr_valid_range_neg.cc        | 2 +-
 .../25_algorithms/upper_bound/debug/constexpr_partitioned_neg.cc        | 2 +-
 .../25_algorithms/upper_bound/debug/constexpr_partitioned_pred_neg.cc   | 2 +-
 .../25_algorithms/upper_bound/debug/constexpr_valid_range_neg.cc        | 2 +-
 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 0e80977ecc5a..384052477717 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 "_Error_formatter::_M_error()" "" { target *-*-* } 0 }
+// { dg-error "_Error_formatter::(_M_error|_S_at)" "" { 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 410c235adf9b..d5d84b1e290e 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,4 +35,4 @@ test()
 
 static_assert(test()); // { dg-error "non-constant condition" }
 
-// { dg-prune-output "_Error_formatter::_M_error()" }
+// { dg-prune-output "_Error_formatter::(_M_error|_S_at)" }
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 cbc75092f145..6c1531d42127 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 "_Error_formatter::_M_error()" "" { target *-*-* } 0 }
+// { dg-error "_Error_formatter::(_M_error|_S_at)" "" { 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 c07145c19269..b44cb4be1d90 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 "_Error_formatter::_M_error()" }
+// { dg-prune-output "_Error_formatter::(_M_error|_S_at)" }
 // { 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 09ae26f9b984..7835b30a0e49 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,4 +33,4 @@ test()
 
 static_assert(test()); // { dg-error "" }
 
-// { dg-prune-output "_Error_formatter::_M_error()" }
+// { dg-prune-output "_Error_formatter::(_M_error|_S_at)" }
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 20eb026e728c..911880b59aa4 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,5 +46,5 @@ test2()
 
 static_assert(test2()); // { dg-error "" }
 
-// { dg-prune-output "_Error_formatter::_M_error()" }
+// { dg-prune-output "_Error_formatter::(_M_error|_S_at)" }
 
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 ffe5d777ac62..950d4325ff7c 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,4 +43,4 @@ test()
 
 static_assert(test()); // { dg-error "" }
 
-// { dg-prune-output "_Error_formatter::_M_error()" }
+// { dg-prune-output "_Error_formatter::(_M_error|_S_at)" }
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 a1c2ce694bc1..41eb00cf4391 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,4 +33,4 @@ test()
 
 static_assert(test()); // { dg-error "" }
 
-// { dg-prune-output "_Error_formatter::_M_error()" }
+// { dg-prune-output "_Error_formatter::(_M_error|_S_at)" }
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 c7c9e3b82a52..032c8d305096 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,4 +46,4 @@ test2()
 
 static_assert(test2()); // { dg-error "" }
 
-// { dg-prune-output "_Error_formatter::_M_error()" }
+// { dg-prune-output "_Error_formatter::(_M_error|_S_at)" }

Reply via email to