3 files changed, 4 insertions, 8 deletions
diff --git a/lldb/include/lldb/Symbol/ClangExternalASTSourceCommon.h b/lldb/include/lldb/Symbol/ClangExternalASTSourceCommon.h
index 8e69f6d3e4e..1d40080033a 100644
--- a/lldb/include/lldb/Symbol/ClangExternalASTSourceCommon.h
+++ b/lldb/include/lldb/Symbol/ClangExternalASTSourceCommon.h
@@ -128,7 +128,6 @@ public:
 
   ClangASTMetadata *GetMetadata(const void *object);
   void SetMetadata(const void *object, ClangASTMetadata &metadata);
-  bool HasMetadata(const void *object);
 
   static ClangExternalASTSourceCommon *Lookup(clang::ExternalASTSource *source);
 
diff --git a/lldb/source/Symbol/ClangASTContext.cpp b/lldb/source/Symbol/ClangASTContext.cpp
index 8c5b0cae34b..e7237a39a9c 100644
--- a/lldb/source/Symbol/ClangASTContext.cpp
+++ b/lldb/source/Symbol/ClangASTContext.cpp
@@ -2419,7 +2419,7 @@ ClangASTMetadata *ClangASTContext::GetMetadata(clang::ASTContext *ast,
   ClangExternalASTSourceCommon *external_source =
       ClangExternalASTSourceCommon::Lookup(ast->getExternalSource());
 
-  if (external_source && external_source->HasMetadata(object))
+  if (external_source)
     return external_source->GetMetadata(object);
   else
     return nullptr;
diff --git a/lldb/source/Symbol/ClangExternalASTSourceCommon.cpp b/lldb/source/Symbol/ClangExternalASTSourceCommon.cpp
index 9c58969dc46..b60b3791aae 100644
--- a/lldb/source/Symbol/ClangExternalASTSourceCommon.cpp
+++ b/lldb/source/Symbol/ClangExternalASTSourceCommon.cpp
@@ -53,8 +53,9 @@ ClangExternalASTSourceCommon::~ClangExternalASTSourceCommon() {
 
 ClangASTMetadata *
 ClangExternalASTSourceCommon::GetMetadata(const void *object) {
-  if (HasMetadata(object))
-    return &m_metadata[object];
+  auto It = m_metadata.find(object);
+  if (It != m_metadata.end())
+    return &It->second;
   else
     return nullptr;
 }
@@ -64,10 +65,6 @@ void ClangExternalASTSourceCommon::SetMetadata(const void *object,
   m_metadata[object] = metadata;
 }
 
-bool ClangExternalASTSourceCommon::HasMetadata(const void *object) {
-  return m_metadata.find(object) != m_metadata.end();
-}
-
 void ClangASTMetadata::Dump(Stream *s) {
   lldb::user_id_t uid = GetUserID();