From dca2770bc073353e621e426d4803b8ea16382b5a Mon Sep 17 00:00:00 2001
From: Marek Polacek <polacek@redhat.com>
Date: Wed, 30 Jan 2019 02:32:33 +0000
Subject: [PATCH] re PR testsuite/89110 (r268343 breaks several tests in c++2a)

	PR testsuite/89110
	* g++.dg/other/nontype-1.C: Expect error in all modes.
	* g++.dg/parse/crash13.C: Likewise.
	* g++.dg/parse/error36.C: Likewise.
	* g++.dg/template/error29.C: Likewise.

From-SVN: r268376
---
 gcc/testsuite/ChangeLog                 | 8 ++++++++
 gcc/testsuite/g++.dg/other/nontype-1.C  | 4 ++--
 gcc/testsuite/g++.dg/parse/crash13.C    | 4 ++--
 gcc/testsuite/g++.dg/parse/error36.C    | 2 +-
 gcc/testsuite/g++.dg/template/error29.C | 4 ++--
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 45e3c7f..5387957 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2019-01-29  Marek Polacek  <polacek@redhat.com>
+
+	PR testsuite/89110
+	* g++.dg/other/nontype-1.C: Expect error in all modes.
+	* g++.dg/parse/crash13.C: Likewise.
+	* g++.dg/parse/error36.C: Likewise.
+	* g++.dg/template/error29.C: Likewise.
+
 2019-01-29  Thomas Koenig  <tkoenig@gcc.gnu.org>
 
 	PR fortran/57048
diff --git a/gcc/testsuite/g++.dg/other/nontype-1.C b/gcc/testsuite/g++.dg/other/nontype-1.C
index 8d90c32..11bbfb8 100644
--- a/gcc/testsuite/g++.dg/other/nontype-1.C
+++ b/gcc/testsuite/g++.dg/other/nontype-1.C
@@ -1,7 +1,7 @@
 template <class Op>
 bool asfun(Op f,
-           Op::first_argument_type a, // { dg-error "not a type" "" { target c++17_down } }
-           Op::second_argument_type b) // { dg-error "not a type" "" { target c++17_down } }
+           Op::first_argument_type a, // { dg-error "not a type" }
+           Op::second_argument_type b) // { dg-error "not a type" }
 {
    return Op(a, b);
 }
diff --git a/gcc/testsuite/g++.dg/parse/crash13.C b/gcc/testsuite/g++.dg/parse/crash13.C
index 7a4939a..3c298ec 100644
--- a/gcc/testsuite/g++.dg/parse/crash13.C
+++ b/gcc/testsuite/g++.dg/parse/crash13.C
@@ -12,11 +12,11 @@ struct A
 };
 
 template <typename T> 
-void func(A<T>::B* )	// { dg-error "variable|template|expression" "" { target c++17_down } }
+void func(A<T>::B* )	// { dg-error "variable|template|expression" }
 {
 }
 
 int main() 
 {
-  func<void>(0);	// { dg-error "not declared|expression|;" "" { target c++17_down } }
+  func<void>(0);	// { dg-error "not declared|expression|;" }
 }
diff --git a/gcc/testsuite/g++.dg/parse/error36.C b/gcc/testsuite/g++.dg/parse/error36.C
index 7e52d15..bf57a6b 100644
--- a/gcc/testsuite/g++.dg/parse/error36.C
+++ b/gcc/testsuite/g++.dg/parse/error36.C
@@ -25,7 +25,7 @@ template <class T> struct B
 
 // PR c++/40738
 template <class T>
-void g(const A<T>::type &t);	// { dg-error "typename" "" { target c++17_down } }
+void g(const A<T>::type &t);	// { dg-error "typename" }
 
 // PR c++/18451
 template <class T> A<T>::B A<T>::b; // { dg-error "typename" "" { target c++17_down } }
diff --git a/gcc/testsuite/g++.dg/template/error29.C b/gcc/testsuite/g++.dg/template/error29.C
index 6e33548..2e2291d 100644
--- a/gcc/testsuite/g++.dg/template/error29.C
+++ b/gcc/testsuite/g++.dg/template/error29.C
@@ -1,5 +1,5 @@
 // PR c++/33209
 
-template<typename T> void foo(int, T::x); // { dg-error "T::x" "" { target c++17_down } }
+template<typename T> void foo(int, T::x); // { dg-error "T::x" }
 
-template<template<typename> class T> void foo2(int, T<int>::x); // { dg-error "T<int>::x" "" { target c++17_down } }
+template<template<typename> class T> void foo2(int, T<int>::x); // { dg-error "T<int>::x" }
-- 
2.7.4