OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

c++: Diagnose a deduction guide in a wrong scope [PR91759]

Browse Source 
The following testcase is accepts-invalid since r7-6608-ga56c0ac08242269b.
Before that change we had this
"deduction guide %qD must be declared in the same scope as %qT"
diagnostics for it, after the change it is expected to be diagnosed
in set_decl_namespace at the not_found: label in there.  On this testcase
nothing is diagnosed though, because set_decl_namespace isn't called at all,
as in_namespace is NULL.

The following patch restores the old warning but does it only in case we
don't call set_decl_namespace.

2020-03-18  Jakub Jelinek  <jakub@redhat.com>

	PR c++/91759
	* decl.c (grokfndecl): Restore old diagnostics about deduction
	guide declared in different scope if in_namespace is NULL_TREE.

	* g++.dg/cpp1z/class-deduction72.C: New test.
This commit is contained in:
Jakub Jelinek 2020-03-18 08:53:23 +01:00
parent 52b3aa8be1
commit af8656be8d
4 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/cp/ChangeLog
View File

@ -1,3 +1,9 @@
2020-03-18 Jakub Jelinek <jakub@redhat.com>
PR c++/91759
* decl.c (grokfndecl): Restore old diagnostics about deduction
guide declared in different scope if in_namespace is NULL_TREE.
2020-03-17 Jakub Jelinek <jakub@redhat.com>
PR c++/90995

9
gcc/cp/decl.c
View File

@ -9644,6 +9644,15 @@ grokfndecl (tree ctype,
"namespace scope", decl);
return NULL_TREE;
}
tree type = TREE_TYPE (DECL_NAME (decl));
if (in_namespace == NULL_TREE
&& CP_DECL_CONTEXT (decl) != CP_TYPE_CONTEXT (type))
{
error_at (location, "deduction guide %qD must be declared in the "
"same scope as %qT", decl, type);
inform (location_of (type), " declared here");
return NULL_TREE;
}
if (funcdef_flag)
error_at (location,
"deduction guide %qD must not have a function body", decl);

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2020-03-18 Jakub Jelinek <jakub@redhat.com>
PR c++/91759
* g++.dg/cpp1z/class-deduction72.C: New test.
2020-03-17 Uroš Bizjak <ubizjak@gmail.com>
* g++.dg/debug/dwarf2/const2b.C (dg-do): Fix target selector.

11
gcc/testsuite/g++.dg/cpp1z/class-deduction72.C Normal file
View File

@ -0,0 +1,11 @@
// PR c++/91759
// { dg-do compile { target c++17 } }
namespace N {
template <typename T>
struct X{ X(int); }; // { dg-message "declared here" }
}
using N::X;
X(int) -> X<int>; // { dg-error "must be declared in the same scope as" }