In CXXRecordDecl::forallBases, add the base to the "queue", so we walk more than one heirarchy of classes. John, please review.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@90948 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 8 insertions, 2 deletions

diff --git a/lib/AST/CXXInheritance.cpp b/lib/AST/CXXInheritance.cpp
index e5300f8284..92a58b76d8 100644
--- a/lib/AST/CXXInheritance.cpp
+++ b/lib/AST/CXXInheritance.cpp
@@ -117,14 +117,16 @@ bool CXXRecordDecl::forallBases(ForallBasesCallback *BaseMatches,
         continue;
       }
 
-      RecordDecl *Base = Ty->getDecl()->getDefinition(Context);
+      CXXRecordDecl *Base = 
+            cast_or_null<CXXRecordDecl>(Ty->getDecl()->getDefinition(Context));
       if (!Base) {
         if (AllowShortCircuit) return false;
         AllMatches = false;
         continue;
       }
       
-      if (!BaseMatches(cast<CXXRecordDecl>(Base), OpaqueData)) {
+      Queue.push_back(Base);
+      if (!BaseMatches(Base, OpaqueData)) {
         if (AllowShortCircuit) return false;
         AllMatches = false;
         continue;
diff --git a/test/SemaCXX/using-decl-1.cpp b/test/SemaCXX/using-decl-1.cpp
index 42deb27027..0235624a8e 100644
--- a/test/SemaCXX/using-decl-1.cpp
+++ b/test/SemaCXX/using-decl-1.cpp
@@ -38,3 +38,7 @@ struct X1 : X0 {
     (*this)(1);
   }
 };
+
+struct A { void f(); };
+struct B : A { };
+class C : B { using B::f; };