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

name-lookup.c (ambiguous_decl): Adds check for hidden types. 

* name-lookup.c (ambiguous_decl): Adds check for hidden types.
	(unqualified_namespace_lookup): Adds check for hidden types.

	* g++.dg/lookup/hidden-class10.C: New test.
	* g++.dg/lookup/hidden-class11.C: New test.

From-SVN: r124963
This commit is contained in:
Ollie Wild 2007-05-22 21:05:01 +00:00 committed by Ollie Wild
parent 6b12f000e0
commit 8e89cbfe6c
5 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/cp/ChangeLog
View File

@ -1,3 +1,8 @@
2007-05-22 Ollie Wild <aaw@google.com>
* name-lookup.c (ambiguous_decl): Adds check for hidden types.
(unqualified_namespace_lookup): Adds check for hidden types.
2007-05-22 Ollie Wild <aaw@google.com>
* decl.c (duplicate_decls): Verify namespace names are unique.

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

@ -3543,7 +3543,7 @@ ambiguous_decl (tree name, struct scope_binding *old, cxx_binding *new,
}
/* ... and copy the type. */
type = new->type;
if (LOOKUP_NAMESPACES_ONLY (flags))
if (LOOKUP_NAMESPACES_ONLY (flags) || (type && hidden_name_p (type)))
type = NULL_TREE;
if (!old->type)
old->type = type;
@ -3699,7 +3699,9 @@ unqualified_namespace_lookup (tree name, int flags)
if (b->value
&& ((flags & LOOKUP_HIDDEN) || !hidden_name_p (b->value)))
binding.value = b->value;
binding.type = b->type;
if (b->type
&& ((flags & LOOKUP_HIDDEN) || !hidden_name_p (b->type)))
binding.type = b->type;
}
/* Add all _DECLs seen through local using-directives. */

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2007-05-22 Ollie Wild <aaw@google.com>
* g++.dg/lookup/hidden-class10.C: New test.
* g++.dg/lookup/hidden-class11.C: New test.
2007-05-22 Ollie Wild <aaw@google.com>
* g++.dg/lookup/name-clash5.C: New test.

11
gcc/testsuite/g++.dg/lookup/hidden-class10.C Normal file
View File

@ -0,0 +1,11 @@
// Copyright (C) 2007 Free Software Foundation
// Contributed by Ollie Wild <aaw@google.com>
// { dg-do compile }
// Verify that a friend class is hidden even if it overrides a builtin
// function name.
class A {
friend class abort;
abort *b; // { dg-error "no type|expected" }
};

23
gcc/testsuite/g++.dg/lookup/hidden-class11.C Normal file
View File

@ -0,0 +1,23 @@
// Copyright (C) 2007 Free Software Foundation
// Contributed by Ollie Wild <aaw@google.com>
// { dg-do compile }
// Verify that a friend class is hidden even if it is hidden by a non-builtin
// function name.
namespace M {
void F (void);
class F;
}
namespace N {
void F(void);
class A {
friend class F;
};
}
using namespace M;
using namespace N;
class F *b;