Add all symfile path in statistic

Author: George Hu

lldb/include/lldb/Symbol/SymbolFile.h

@@ -355,6 +355,8 @@ class SymbolFile : public PluginInterface {
   virtual const ObjectFile *GetObjectFile() const = 0;
   virtual ObjectFile *GetMainObjectFile() = 0;
 
+  virtual std::vector<ObjectFile *> GetAllObjectFiles();
+
   virtual std::vector<std::unique_ptr<CallEdge>>
   ParseCallEdgesInFunction(UserID func_id) {
     return {};

lldb/include/lldb/Target/Statistics.h

@@ -111,7 +111,7 @@ struct ModuleStats {
   std::string uuid;
   std::string triple;
   // Path separate debug info file, or empty if none.
-  std::string symfile_path;
+  std::vector<std::string> symfile_path;
   // If the debug info is contained in multiple files where each one is
   // represented as a separate lldb_private::Module, then these are the
   // identifiers of these modules in the global module list. This allows us to

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

@@ -4354,6 +4354,22 @@ LanguageType SymbolFileDWARF::GetLanguageFamily(DWARFUnit &unit) {
   return LanguageTypeFromDWARF(lang);
 }
 
+std::vector<ObjectFile *> SymbolFileDWARF::GetAllObjectFiles() {
+  std::vector<ObjectFile *> object_files;
+  object_files.push_back(m_objfile_sp.get());
+  if (m_dwp_symfile) {
+    std::vector<ObjectFile *> dwp_files = m_dwp_symfile->GetAllObjectFiles();
+    object_files.insert(object_files.end(), dwp_files.begin(), dwp_files.end());
+  }
+  if (m_debug_map_symfile) {
+    std::vector<ObjectFile *> debug_map_files =
+        m_debug_map_symfile->GetAllObjectFiles();
+    object_files.insert(object_files.end(), debug_map_files.begin(),
+                        debug_map_files.end());
+  }
+  return object_files;
+}
+
 StatsDuration::Duration SymbolFileDWARF::GetSymbolLocateTime() {
   StatsDuration total_time;
   total_time += GetObjectFile()->GetLocateTime();

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

@@ -306,6 +306,8 @@ class SymbolFileDWARF : public SymbolFileCommon {
   /// Same as GetLanguage() but reports all C++ versions as C++ (no version).
   static lldb::LanguageType GetLanguageFamily(DWARFUnit &unit);
 
+  std::vector<ObjectFile *> GetAllObjectFiles() override;
+
   StatsDuration::Duration GetDebugInfoParseTime() override {
     return m_parse_time;
   }

lldb/source/Symbol/SymbolFile.cpp

@@ -150,6 +150,12 @@ void SymbolFile::AssertModuleLock() {
 #endif
 }
 
+std::vector<ObjectFile *> SymbolFile::GetAllObjectFiles() {
+  std::vector<ObjectFile *> object_files;
+  object_files.push_back(GetObjectFile());
+  return object_files;
+}
+
 SymbolFile::RegisterInfoResolver::~RegisterInfoResolver() = default;
 
 Symtab *SymbolFileCommon::GetSymtab() {

lldb/source/Target/Statistics.cpp

@@ -72,8 +72,14 @@ json::Value ModuleStats::ToJSON() const {
                      debug_info_had_incomplete_types);
   module.try_emplace("symbolTableStripped", symtab_stripped);
   module.try_emplace("symbolLocateTime", symbol_locate_time);
-  if (!symfile_path.empty())
-    module.try_emplace("symbolFilePath", symfile_path);
+  if (!symfile_path.empty()) {
+    json::Array symbolfile_path;
+    for (std::string const &path : symfile_path)
+      if (!path.empty())
+        symbolfile_path.emplace_back(path);
+    if (!symbolfile_path.empty())
+      module.try_emplace("symbolFilePaths", std::move(symbolfile_path));
+  }
 
   if (!symfile_modules.empty()) {
     json::Array symfile_ids;
@@ -330,9 +336,9 @@ llvm::json::Value DebuggerStats::ReportStatistics(
     SymbolFile *sym_file = module->GetSymbolFile(/*can_create=*/false);
     if (sym_file) {
       if (!summary_only) {
-        if (sym_file->GetObjectFile() != module->GetObjectFile())
-          module_stat.symfile_path =
-              sym_file->GetObjectFile()->GetFileSpec().GetPath();
+        for (ObjectFile *sym_objfile : sym_file->GetAllObjectFiles())
+          module_stat.symfile_path.push_back(
+              sym_objfile->GetFileSpec().GetPath());
         ModuleList symbol_modules = sym_file->GetDebugInfoModules();
         for (const auto &symbol_module : symbol_modules.Modules())
           module_stat.symfile_modules.push_back((intptr_t)symbol_module.get());