[cfe-commits] r117112 - in /cfe/trunk: include/clang/Sema/Lookup.h test/SemaTemplate/member-access-ambig.cpp

[Douglas Gregor]

Author: dgregor
Date: Fri Oct 22 12:36:51 2010
New Revision: 117112

URL: http://llvm.org/viewvc/llvm-project?rev=117112&view=rev
Log:
When we perform name lookup for a template, we may end up finding an
ambiguous name where none of the declarations found are actually
templates. In this case, make sure we clear out the ambiguous-path
data when recomputing the lookup result kind. Fixes PR8439.


Added:
    cfe/trunk/test/SemaTemplate/member-access-ambig.cpp
Modified:
    cfe/trunk/include/clang/Sema/Lookup.h

Modified: cfe/trunk/include/clang/Sema/Lookup.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Sema/Lookup.h?rev=117112&r1=117111&r2=117112&view=diff
==============================================================================
--- cfe/trunk/include/clang/Sema/Lookup.h (original)
+++ cfe/trunk/include/clang/Sema/Lookup.h Fri Oct 22 12:36:51 2010
@@ -365,6 +365,11 @@
     if (Decls.empty()) {
       if (ResultKind != NotFoundInCurrentInstantiation)
         ResultKind = NotFound;
+
+      if (Paths) {
+        deletePaths(Paths);
+        Paths = 0;
+      }
     } else {
       AmbiguityKind SavedAK = Ambiguity;
       ResultKind = Found;

Added: cfe/trunk/test/SemaTemplate/member-access-ambig.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaTemplate/member-access-ambig.cpp?rev=117112&view=auto
==============================================================================
--- cfe/trunk/test/SemaTemplate/member-access-ambig.cpp (added)
+++ cfe/trunk/test/SemaTemplate/member-access-ambig.cpp Fri Oct 22 12:36:51 2010
@@ -0,0 +1,35 @@
+// RUN: %clang_cc1 -fsyntax-only -verify %s
+
+// PR8439
+class A
+{
+};
+
+class B
+{
+public:
+  A & m;
+};
+
+class Base
+{
+public:
+  B &f();
+};
+
+class Derived1 : public Base { };
+
+class Derived2 : public Base { };
+
+class X : public B, public Derived2, public Derived1
+{
+public:
+  virtual void g();
+};
+
+void X::g()
+{
+  m.f<int>(); // expected-error{{no member named 'f' in 'A'}} \
+  // expected-error{{expected '(' for function-style cast}} \
+  // expected-error{{expected expression}}
+}