]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
c++: fix testcases
authorJason Merrill <jason@redhat.com>
Thu, 12 May 2022 12:13:02 +0000 (08:13 -0400)
committerJason Merrill <jason@redhat.com>
Fri, 13 May 2022 17:39:14 +0000 (13:39 -0400)
Only the first dg-error in constexpr-array23.C needs to be xfailed on the 9
branch.

lambda-pack-init6.C depends on the fix for PR94546; rather than backport
that as well, let's remove the test.

gcc/testsuite/ChangeLog:

* g++.dg/cpp0x/constexpr-array23.C: Remove xfail.
* g++.dg/cpp2a/lambda-pack-init6.C: Removed.

gcc/testsuite/g++.dg/cpp0x/constexpr-array23.C
gcc/testsuite/g++.dg/cpp2a/lambda-pack-init6.C [deleted file]

index e94695efa2aea4eb2671408175801be08b5b6ea2..47079dc38fc0a9503baabd55ef876c07134bfe2d 100644 (file)
@@ -11,7 +11,7 @@ struct A
 struct B
 {                              // This should really be target { ! c++2a }
   typedef A W[4];              // { dg-error "paren" "" { xfail *-*-* } .+1 }
-  constexpr B () : w ({ A::z, A::z, A::z, A::z }) {} // { dg-error "constant" "" { xfail *-*-* } }
+  constexpr B () : w ({ A::z, A::z, A::z, A::z }) {} // { dg-error "constant" }
   W w;
 };
 
diff --git a/gcc/testsuite/g++.dg/cpp2a/lambda-pack-init6.C b/gcc/testsuite/g++.dg/cpp2a/lambda-pack-init6.C
deleted file mode 100644 (file)
index 137e4e9..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-// PR c++/97938
-// { dg-do compile { target c++2a } }
-
-template <typename... Args>
-int sink(Args&&... args) { return 2; }
-
-auto fwd1(const auto&&... ts1) {
-  return
-    [...ts1 = ts1] {
-      return sink(ts1...);
-    }();
-}
-
-template <typename T1>
-auto fwd2(const T1& t1) {
-  return
-    [] (auto&&... ts1) {
-      return
-       [...ts1 = ts1] {
-         return sink(ts1...);
-       }();
-    }();
-}
-
-int main() {
-  return fwd1() + fwd2(1);
-}