Moved IsDwp to a local function for now

Author: Kevin Frei

lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp

@@ -39,7 +39,6 @@
 #include "lldb/Interpreter/OptionValueProperties.h"
 
 #include "Plugins/ExpressionParser/Clang/ClangUtil.h"
-#include "Plugins/ObjectFile/ELF/ObjectFileELF.h"
 #include "Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.h"
 #include "Plugins/TypeSystem/Clang/TypeSystemClang.h"
 #include "lldb/Symbol/Block.h"
@@ -4348,23 +4347,6 @@ SymbolFileDWARFDebugMap *SymbolFileDWARF::GetDebugMapSymfile() {
   return m_debug_map_symfile;
 }
 
-bool SymbolFileDWARF::IsDwpSymbolFile(const lldb::ModuleSP &module_sp,
-                                      const FileSpec &file_spec) {
-  DataBufferSP dwp_file_data_sp;
-  lldb::offset_t dwp_file_data_offset = 0;
-  // Try to create an ObjectFileELF frorm the filespace
-  ObjectFileSP dwp_obj_file = ObjectFile::FindPlugin(
-      module_sp, &file_spec, 0, FileSystem::Instance().GetByteSize(file_spec),
-      dwp_file_data_sp, dwp_file_data_offset);
-  if (!ObjectFileELF::classof(dwp_obj_file.get()))
-    return false;
-  static ConstString sect_name_debug_cu_index(".debug_cu_index");
-  if (!dwp_obj_file || !dwp_obj_file->GetSectionList()->FindSectionByName(
-                           sect_name_debug_cu_index))
-    return false;
-  return true;
-}
-
 const std::shared_ptr<SymbolFileDWARFDwo> &SymbolFileDWARF::GetDwpSymbolFile() {
   llvm::call_once(m_dwp_symfile_once_flag, [this]() {
     // Create a list of files to try and append .dwp to.

lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h

@@ -280,9 +280,6 @@ class SymbolFileDWARF : public SymbolFileCommon {
 
   DWARFContext &GetDWARFContext() { return m_context; }
 
-  static bool IsDwpSymbolFile(const lldb::ModuleSP &module_sp,
-                              const FileSpec &file_spec);
-
   const std::shared_ptr<SymbolFileDWARFDwo> &GetDwpSymbolFile();
 
   FileSpec GetFile(DWARFUnit &unit, size_t file_idx);

lldb/source/Plugins/SymbolLocator/Debuginfod/SymbolLocatorDebuginfod.cpp

@@ -96,13 +96,13 @@ class PluginProperties : public Properties {
   Args m_server_urls;
 };
 
-PluginProperties &GetGlobalPluginProperties() {
+} // namespace
+
+static PluginProperties &GetGlobalPluginProperties() {
   static PluginProperties g_settings;
   return g_settings;
 }
 
-} // namespace
-
 SymbolLocatorDebuginfod::SymbolLocatorDebuginfod() : SymbolLocator() {}
 
 void SymbolLocatorDebuginfod::Initialize() {

lldb/source/Plugins/SymbolVendor/ELF/SymbolVendorELF.cpp

@@ -11,7 +11,6 @@
 #include <cstring>
 
 #include "Plugins/ObjectFile/ELF/ObjectFileELF.h"
-#include "Plugins/SymbolFile/DWARF/SymbolFileDWARF.h"
 #include "lldb/Core/Module.h"
 #include "lldb/Core/ModuleSpec.h"
 #include "lldb/Core/PluginManager.h"
@@ -45,6 +44,24 @@ llvm::StringRef SymbolVendorELF::GetPluginDescriptionStatic() {
          "executables.";
 }
 
+// If this is needed elsewhere, it can be exported/moved.
+static bool IsDwpSymbolFile(const lldb::ModuleSP &module_sp,
+                            const FileSpec &file_spec) {
+  DataBufferSP dwp_file_data_sp;
+  lldb::offset_t dwp_file_data_offset = 0;
+  // Try to create an ObjectFileELF frorm the filespace
+  ObjectFileSP dwp_obj_file = ObjectFile::FindPlugin(
+      module_sp, &file_spec, 0, FileSystem::Instance().GetByteSize(file_spec),
+      dwp_file_data_sp, dwp_file_data_offset);
+  if (!ObjectFileELF::classof(dwp_obj_file.get()))
+    return false;
+  static ConstString sect_name_debug_cu_index(".debug_cu_index");
+  if (!dwp_obj_file || !dwp_obj_file->GetSectionList()->FindSectionByName(
+                           sect_name_debug_cu_index))
+    return false;
+  return true;
+}
+
 // CreateInstance
 //
 // Platforms can register a callback to use when creating symbol vendors to
@@ -88,8 +105,7 @@ SymbolVendorELF::CreateInstance(const lldb::ModuleSP &module_sp,
   FileSpecList search_paths = Target::GetDefaultDebugFileSearchPaths();
   FileSpec dsym_fspec =
       PluginManager::LocateExecutableSymbolFile(module_spec, search_paths);
-  if (!dsym_fspec ||
-      plugin::dwarf::SymbolFileDWARF::IsDwpSymbolFile(module_sp, dsym_fspec)) {
+  if (!dsym_fspec || IsDwpSymbolFile(module_sp, dsym_fspec)) {
     // If we have a stripped binary or if we got a DWP file, we should prefer
     // symbols in the executable acquired through a plugin.
     ModuleSpec unstripped_spec =