mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-02-21 19:15:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

re PR c++/69657 (abs() not inlined after including math.h)

Browse Source 
PR c++/69657
	* name-lookup.c (lookup_qualified_name): Add find_hidden parm.
	(set_decl_namespace): Pass it.  Complain about finding a hidden friend.
	* name-lookup.h: Adjust.

From-SVN: r233470
This commit is contained in:
Jason Merrill 2016-02-16 14:01:49 -05:00 committed by Jason Merrill
parent 7005800cd1
commit 7128d6ab21
4 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/cp/ChangeLog
View File

@ -1,3 +1,10 @@
2016-02-16 Jason Merrill <jason@redhat.com>
PR c++/69657
* name-lookup.c (lookup_qualified_name): Add find_hidden parm.
(set_decl_namespace): Pass it. Complain about finding a hidden friend.
* name-lookup.h: Adjust.
2016-02-16 James Norris <jnorris@codesourcery.com>
* parser.c (cp_parser_oacc_data_clause_deviceptr): Remove checking.

15
gcc/cp/name-lookup.c
View File

@ -3502,7 +3502,8 @@ set_decl_namespace (tree decl, tree scope, bool friendp)
}
/* See whether this has been declared in the namespace. */
old = lookup_qualified_name (scope, DECL_NAME (decl), false, true);
old = lookup_qualified_name (scope, DECL_NAME (decl), /*type*/false,
/*complain*/true, /*hidden*/true);
if (old == error_mark_node)
/* No old declaration at all. */
goto complain;
@ -3565,6 +3566,12 @@ set_decl_namespace (tree decl, tree scope, bool friendp)
{
if (!is_associated_namespace (scope, CP_DECL_CONTEXT (found)))
goto complain;
if (DECL_HIDDEN_FRIEND_P (found))
{
pedwarn (DECL_SOURCE_LOCATION (decl), 0,
"%qD has not been declared within %D", decl, scope);
inform (DECL_SOURCE_LOCATION (found), "only here as a friend");
}
DECL_CONTEXT (decl) = DECL_CONTEXT (found);
return;
}
@ -4509,11 +4516,15 @@ unqualified_namespace_lookup (tree name, int flags)
neither a class-type nor a namespace a diagnostic is issued. */
tree
lookup_qualified_name (tree scope, tree name, bool is_type_p, bool complain)
lookup_qualified_name (tree scope, tree name, bool is_type_p, bool complain,
bool find_hidden)
{
int flags = 0;
tree t = NULL_TREE;
if (find_hidden)
flags |= LOOKUP_HIDDEN;
if (TREE_CODE (scope) == NAMESPACE_DECL)
{
struct scope_binding binding = EMPTY_SCOPE_BINDING;

2
gcc/cp/name-lookup.h
View File

@ -327,7 +327,7 @@ extern tree namespace_binding (tree, tree);
extern void set_namespace_binding (tree, tree, tree);
extern bool hidden_name_p (tree);
extern tree remove_hidden_names (tree);
extern tree lookup_qualified_name (tree, tree, bool, bool);
extern tree lookup_qualified_name (tree, tree, bool, bool, /*hidden*/bool = false);
extern tree lookup_name_nonclass (tree);
extern tree lookup_name_innermost_nonclass_level (tree);
extern bool is_local_extern (tree);

9
gcc/testsuite/g++.dg/lookup/friend17.C Normal file
View File

@ -0,0 +1,9 @@
// PR c++/69657
// { dg-options "-Wpedantic" }
namespace N {
struct A {
friend void f(A);
};
}
void N::f(A) { } // { dg-warning "declared" }