===================================================================
@@ -4740,11 +4740,11 @@ lookup_name_real_1 (tree name, int prefer_type, in
continue;
/* 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)
+ && qualify_lookup (iter->type, flags))
+ binding = iter->type;
+ else if (qualify_lookup (iter->value, flags))
binding = iter->value;
- else if ((flags & LOOKUP_PREFER_TYPES)
- && qualify_lookup (iter->type, flags))
- binding = iter->type;
else
binding = NULL_TREE;
===================================================================
@@ -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;
+ }
+};