diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2013-08-07 10:10:27 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2013-08-07 10:10:27 +0000 |
| commit | dd81965b766c8465c2eec3ae4563f0076a899f8d (patch) | |
| tree | acd7e4cba3fe1b5cfcd2ce64ea2edb289f5d3427 /gcc | |
| parent | 2077db1be5b18b94a91095a3fb380bbc4a81e61b (diff) | |
| download | gcc-dd81965b766c8465c2eec3ae4563f0076a899f8d.zip gcc-dd81965b766c8465c2eec3ae4563f0076a899f8d.tar.gz gcc-dd81965b766c8465c2eec3ae4563f0076a899f8d.tar.bz2 | |
re PR c++/46206 (using typedef-name error with typedef name hiding struct name)
/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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/name-lookup.c | 8 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/lookup/typedef2.C | 30 |
4 files changed, 45 insertions, 4 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 624af2b..d3709fa 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -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> * Make-lang.in (*CXX_AND_OBJCXX_OBJS): Add vtable-class-hierarchy.o to diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c index 0fe0246..05f0480 100644 --- a/gcc/cp/name-lookup.c +++ b/gcc/cp/name-lookup.c @@ -4740,11 +4740,11 @@ lookup_name_real_1 (tree name, int prefer_type, int nonclass, bool block_p, continue; /* If this is the kind of thing we're looking for, we're done. */ - if (qualify_lookup (iter->value, flags)) - binding = iter->value; - else if ((flags & LOOKUP_PREFER_TYPES) - && qualify_lookup (iter->type, flags)) + if ((flags & LOOKUP_PREFER_TYPES) + && qualify_lookup (iter->type, flags)) binding = iter->type; + else if (qualify_lookup (iter->value, flags)) + binding = iter->value; else binding = NULL_TREE; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 2f8197f..ef030b0 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -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> * lib/plugin-support.exp (plugin-test-execute): Add -fno-rtti diff --git a/gcc/testsuite/g++.dg/lookup/typedef2.C b/gcc/testsuite/g++.dg/lookup/typedef2.C new file mode 100644 index 0000000..fdadeec --- /dev/null +++ b/gcc/testsuite/g++.dg/lookup/typedef2.C @@ -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; + } +}; |