Merge pull request #243 from Teemperor/swift/master

[upstreaming] Revert changes to ClangASTContext::GetIndexForRecordBase

Author: Teemperor

lldb/include/lldb/Symbol/ClangASTContext.h

@@ -266,11 +266,6 @@ class ClangASTContext : public TypeSystem {
   static uint32_t GetNumBaseClasses(const clang::CXXRecordDecl *cxx_record_decl,
                                     bool omit_empty_base_classes);
 
-  static uint32_t
-  GetIndexForRecordBase(const clang::RecordDecl *record_decl,
-                        const clang::CXXBaseSpecifier *base_spec,
-                        bool omit_empty_base_classes);
-
   CompilerType CreateRecordType(clang::DeclContext *decl_ctx,
                                 lldb::AccessType access_type, const char *name,
                                 int kind, lldb::LanguageType language,

lldb/source/Symbol/ClangASTContext.cpp

@@ -7129,10 +7129,9 @@ CompilerType ClangASTContext::GetChildCompilerTypeAtIndex(
   return CompilerType();
 }
 
-uint32_t
-ClangASTContext::GetIndexForRecordBase(const clang::RecordDecl *record_decl,
-                                       const clang::CXXBaseSpecifier *base_spec,
-                                       bool omit_empty_base_classes) {
+static uint32_t GetIndexForRecordBase(const clang::RecordDecl *record_decl,
+                                      const clang::CXXBaseSpecifier *base_spec,
+                                      bool omit_empty_base_classes) {
   uint32_t child_idx = 0;
 
   const clang::CXXRecordDecl *cxx_record_decl =
@@ -7274,10 +7273,10 @@ size_t ClangASTContext::GetIndexOfChildMemberWithName(
 
           clang::CXXBasePaths paths;
           if (cxx_record_decl->lookupInBases(
-                  [&decl_name](const CXXBaseSpecifier *base_specifier,
-                               CXXBasePath &base_path) {
+                  [decl_name](const clang::CXXBaseSpecifier *specifier,
+                              clang::CXXBasePath &path) {
                     return clang::CXXRecordDecl::FindOrdinaryMember(
-                        base_specifier, base_path, decl_name);
+                        specifier, path, decl_name);
                   },
                   paths)) {
             clang::CXXBasePaths::const_paths_iterator path,