2 files changed, 40 insertions, 0 deletions
diff --git a/include/clang/Sema/Lookup.h b/include/clang/Sema/Lookup.h
index 1c7720abb1..1badca21d2 100644
--- a/include/clang/Sema/Lookup.h
+++ b/include/clang/Sema/Lookup.h
@@ -365,6 +365,11 @@ public:
     if (Decls.empty()) {
       if (ResultKind != NotFoundInCurrentInstantiation)
         ResultKind = NotFound;
+
+      if (Paths) {
+        deletePaths(Paths);
+        Paths = 0;
+      }
     } else {
       AmbiguityKind SavedAK = Ambiguity;
       ResultKind = Found;
diff --git a/test/SemaTemplate/member-access-ambig.cpp b/test/SemaTemplate/member-access-ambig.cpp
new file mode 100644
index 0000000000..bf190435ec
--- /dev/null
+++ b/test/SemaTemplate/member-access-ambig.cpp
@@ -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}}
+}