mirrors/gcc
0
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-12-27 04:55:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

re PR c++/46206 (using typedef-name error with typedef name hiding struct name)

Browse Source 
/cp
2013-08-07  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/46206
	* name-lookup.c (lookup_name_real_1): Handle iter->type before
	iter->value.

/testsuite
2013-08-07  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/46206
	* g++.dg/lookup/typedef2.C: New.

From-SVN: r201558
This commit is contained in:
Paolo Carlini 2013-08-07 10:10:27 +00:00 committed by Paolo Carlini
parent 2077db1be5
commit dd81965b76
4 changed files with 45 additions and 4 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 @@
2013-08-07 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/46206
* name-lookup.c (lookup_name_real_1): Handle iter->type before
iter->value.
2013-08-06 Caroline Tice <cmtice@google.com> 2013-08-06 Caroline Tice <cmtice@google.com>
* Make-lang.in (*CXX_AND_OBJCXX_OBJS): Add vtable-class-hierarchy.o to * Make-lang.in (*CXX_AND_OBJCXX_OBJS): Add vtable-class-hierarchy.o to

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

@ -4740,11 +4740,11 @@ lookup_name_real_1 (tree name, int prefer_type, int nonclass, bool block_p,
continue; continue;
/* If this is the kind of thing we're looking for, we're done. */ /* If this is the kind of thing we're looking for, we're done. */
if (qualify_lookup (iter->value, flags)) if ((flags & LOOKUP_PREFER_TYPES)
binding = iter->value; && qualify_lookup (iter->type, flags))
else if ((flags & LOOKUP_PREFER_TYPES)
&& qualify_lookup (iter->type, flags))
binding = iter->type; binding = iter->type;
else if (qualify_lookup (iter->value, flags))
binding = iter->value;
else else
binding = NULL_TREE; binding = NULL_TREE;

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2013-08-07 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/46206
* g++.dg/lookup/typedef2.C: New.
2013-08-07 David Malcolm <dmalcolm@redhat.com> 2013-08-07 David Malcolm <dmalcolm@redhat.com>
* lib/plugin-support.exp (plugin-test-execute): Add -fno-rtti * lib/plugin-support.exp (plugin-test-execute): Add -fno-rtti

30
gcc/testsuite/g++.dg/lookup/typedef2.C Normal file
View File

@ -0,0 +1,30 @@
// PR c++/46206
class Foo1
{
int u, v, w, x;
typedef struct Bar { } Bar;
virtual void foo(void) {
struct Bar bar;
}
};
class Foo2
{
int u, v, w;
typedef struct Bar { } Bar;
Bar bar;
virtual void foo(void) {
struct Bar bar;
}
};
class Foo3
{
int u, v, w;
typedef struct Bar { } Bar;
int Bar; // { dg-error "conflicts" }
virtual void foo(void) {
struct Bar bar;
}
};