[lldb] Fix compile error in lldb

Signed-off-by: yronglin <[email protected]>

Author: yronglin

lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp

@@ -13,6 +13,7 @@
 #include "clang/Basic/Builtins.h"
 #include "clang/Basic/DarwinSDKInfo.h"
 #include "clang/Basic/DiagnosticIDs.h"
+#include "clang/Basic/IdentifierTable.h"
 #include "clang/Basic/SourceLocation.h"
 #include "clang/Basic/TargetInfo.h"
 #include "clang/Basic/Version.h"
@@ -135,8 +136,9 @@ class ClangExpressionParser::LLDBPreprocessorCallbacks : public PPCallbacks {
 
     SourceModule module;
 
-    for (const std::pair<IdentifierInfo *, SourceLocation> &component : path)
-      module.path.push_back(ConstString(component.first->getName()));
+    for (const IdentifierLoc &component : path)
+      module.path.push_back(
+          ConstString(component.getIdentifierInfo()->getName()));
 
     StreamString error_stream;
 

lldb/source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp

@@ -8,6 +8,7 @@
 
 #include "clang/Basic/Diagnostic.h"
 #include "clang/Basic/DiagnosticFrontend.h"
+#include "clang/Basic/IdentifierTable.h"
 #include "clang/Basic/TargetInfo.h"
 #include "clang/Frontend/CompilerInstance.h"
 #include "clang/Frontend/FrontendActions.h"
@@ -334,20 +335,18 @@ bool ClangModulesDeclVendorImpl::AddModule(const SourceModule &module,
     return false;
   }
 
-  llvm::SmallVector<std::pair<clang::IdentifierInfo *, clang::SourceLocation>,
-                    4>
-      clang_path;
+  llvm::SmallVector<clang::IdentifierLoc, 4> clang_path;
 
   {
     clang::SourceManager &source_manager =
         m_compiler_instance->getASTContext().getSourceManager();
 
     for (ConstString path_component : module.path) {
-      clang_path.push_back(std::make_pair(
-          &m_compiler_instance->getASTContext().Idents.get(
-              path_component.GetStringRef()),
+      clang_path.emplace_back(
           source_manager.getLocForStartOfFile(source_manager.getMainFileID())
-              .getLocWithOffset(m_source_location_index++)));
+              .getLocWithOffset(m_source_location_index++),
+          &m_compiler_instance->getASTContext().Idents.get(
+              path_component.GetStringRef()));
     }
   }
 
@@ -629,8 +628,8 @@ ClangModulesDeclVendorImpl::DoGetModule(clang::ModuleIdPath path,
 
   const bool is_inclusion_directive = false;
 
-  return m_compiler_instance->loadModule(path.front().second, path, visibility,
-                                         is_inclusion_directive);
+  return m_compiler_instance->loadModule(path.front().getLoc(), path,
+                                         visibility, is_inclusion_directive);
 }
 
 static const char *ModuleImportBufferName = "LLDBModulesMemoryBuffer";