C++ PATCH to fix r268343 fallout (PR testsuite/89110)

[Marek Polacek]

As a consequence of r268343, the following tests need to be updated to
expect the error in all modes.

Sorry for the breakage.

Tested on x86_64-linux, ok for trunk?

2019-01-29  Marek Polacek  <pola...@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.

diff --git gcc/testsuite/g++.dg/other/nontype-1.C 
gcc/testsuite/g++.dg/other/nontype-1.C
index 8d90c322a7e..11bbfb82968 100644
--- gcc/testsuite/g++.dg/other/nontype-1.C
+++ 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 gcc/testsuite/g++.dg/parse/crash13.C 
gcc/testsuite/g++.dg/parse/crash13.C
index 7a4939a462d..3c298ec8ede 100644
--- gcc/testsuite/g++.dg/parse/crash13.C
+++ 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 gcc/testsuite/g++.dg/parse/error36.C 
gcc/testsuite/g++.dg/parse/error36.C
index 7e52d1537e0..bf57a6b68ce 100644
--- gcc/testsuite/g++.dg/parse/error36.C
+++ 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 gcc/testsuite/g++.dg/template/error29.C 
gcc/testsuite/g++.dg/template/error29.C
index 6e335487224..2e2291d7e87 100644
--- gcc/testsuite/g++.dg/template/error29.C
+++ 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" }