From 96d73645c77e7784ebd12527322d52b6b7eedb06 Mon Sep 17 00:00:00 2001 From: Patrick Palka Date: Tue, 13 Apr 2021 15:40:08 -0400 Subject: [PATCH] c++: Adjust expected diagnostics for old-deja tests [PR99008] I missed adjusting these tests in the recently committed r11-8155. gcc/testsuite/ChangeLog: PR c++/99008 * g++.old-deja/g++.ns/crash3.C: Adjust expected diagnostic. * g++.old-deja/g++.ns/template7.C: Likewise. * g++.old-deja/g++.pt/crash8.C: Likewise. --- gcc/testsuite/g++.old-deja/g++.ns/crash3.C | 2 +- gcc/testsuite/g++.old-deja/g++.ns/template7.C | 2 +- gcc/testsuite/g++.old-deja/g++.pt/crash8.C | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gcc/testsuite/g++.old-deja/g++.ns/crash3.C b/gcc/testsuite/g++.old-deja/g++.ns/crash3.C index 189298d..b5e6323 100644 --- a/gcc/testsuite/g++.old-deja/g++.ns/crash3.C +++ b/gcc/testsuite/g++.old-deja/g++.ns/crash3.C @@ -6,6 +6,6 @@ namespace N { void f() { - N::S(); // { dg-error "6:cannot deduce template arguments" "" { target c++17 } } invalid use of template + N::S(); // { dg-error "8:class template argument deduction failed|no match" "" { target c++17 } } invalid use of template // { dg-error "7:missing template arguments" "" { target c++14_down } .-1 } } diff --git a/gcc/testsuite/g++.old-deja/g++.ns/template7.C b/gcc/testsuite/g++.old-deja/g++.ns/template7.C index 71366b7..441a412 100644 --- a/gcc/testsuite/g++.old-deja/g++.ns/template7.C +++ b/gcc/testsuite/g++.old-deja/g++.ns/template7.C @@ -8,6 +8,6 @@ namespace foo { } void baz() { - foo::bar(); // { dg-error "8:cannot deduce template arguments" "" { target c++17 } } template used as expression + foo::bar(); // { dg-error "12:class template argument deduction failed|no match" "" { target c++17 } } template used as expression // { dg-error "11:missing template arguments" "" { target c++14_down } .-1 } } diff --git a/gcc/testsuite/g++.old-deja/g++.pt/crash8.C b/gcc/testsuite/g++.old-deja/g++.pt/crash8.C index 7b4eff5..678a728 100644 --- a/gcc/testsuite/g++.old-deja/g++.pt/crash8.C +++ b/gcc/testsuite/g++.old-deja/g++.pt/crash8.C @@ -21,11 +21,11 @@ void doit(T x) { q2 = TestClass2(); TestClass1 p1; - p1 = TestClass1(); // { dg-error "8:cannot deduce template arguments" "" { target c++17 } } template used as expression + p1 = TestClass1(); // { dg-error "19:class template argument deduction failed|no match" "" { target c++17 } } template used as expression // { dg-error "18:missing template arguments" "" { target c++14_down } .-1 } TestClass2 p2; - p2 = TestClass2(); // { dg-error "8:cannot deduce template arguments" "" { target c++17 } } template used as expression + p2 = TestClass2(); // { dg-error "19:class template argument deduction failed|no match" "" { target c++17 } } template used as expression // { dg-error "18:missing template arguments" "" { target c++14_down } .-1 } } -- 2.7.4