From: Jason Merrill <jason@redhat.com>
Date: Thu, 12 May 2022 12:13:02 +0000 (-0400)
Subject: c++: fix testcases
X-Git-Tag: releases/gcc-9.5.0~41
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=967f950b74bcafd2954a2414aa3d931c381c0887;p=thirdparty%2Fgcc.git

c++: fix testcases

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.
---

diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-array23.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-array23.C
index e94695efa2ae..47079dc38fc0 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-array23.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-array23.C
@@ -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
index 137e4e9fab35..000000000000
--- a/gcc/testsuite/g++.dg/cpp2a/lambda-pack-init6.C
+++ /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);
-}