address review comments

Author: midhuncodes7

llvm/include/llvm/DebugInfo/Symbolize/Symbolize.h

@@ -1,5 +1,4 @@
-//===- Symbolize.h ----------------------------------------------*- C++
-//-*-===//
+//===- Symbolize.h ----------------------------------------------*- C++//-*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -247,8 +246,8 @@ class LLVMSymbolizer {
   };
 
   /// Parsed object file for each path/member/architecture triple.
-  /// Used to cache objects extracted from containers (Mach-O universal
-  /// binaries, archives).
+  /// Used to cache objects extracted from containers (e.g: Mach-O
+  /// universal binaries, archives).
   std::map<ContainerCacheKey, std::unique_ptr<ObjectFile>> ObjectFileCache;
 
   Expected<object::Binary *>

llvm/lib/DebugInfo/Symbolize/Symbolize.cpp

@@ -1,5 +1,4 @@
-//===-- LLVMSymbolize.cpp
-//-------------------------------------------------===//
+//===-- LLVMSymbolize.cpp//-------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -641,13 +640,21 @@ Expected<ObjectFile *> LLVMSymbolizer::getOrCreateObjectFromArchive(
   Error Err = Error::success();
   for (auto &Child : Archive->children(Err, /*SkipInternal=*/true)) {
     Expected<StringRef> NameOrErr = Child.getName();
-    if (!NameOrErr)
+    if (!NameOrErr) {
+      // TODO: Report this as a warning to the client. Consider adding a
+      // callback mechanism to report warning-level issues.
+      consumeError(NameOrErr.takeError());
       continue;
+    }
     if (*NameOrErr == MemberName) {
       Expected<std::unique_ptr<object::Binary>> MemberOrErr =
           Child.getAsBinary();
-      if (!MemberOrErr)
+      if (!MemberOrErr) {
+        // TODO: Report this as a warning to the client. Consider adding a
+        // callback mechanism to report warning-level issues.
+        consumeError(MemberOrErr.takeError());
         continue;
+      }
 
       std::unique_ptr<object::Binary> Binary = std::move(*MemberOrErr);
       if (auto *Obj = dyn_cast<object::ObjectFile>(Binary.get())) {
@@ -691,9 +698,8 @@ LLVMSymbolizer::getOrCreateObject(const std::string &Path,
       StringRef ArchivePath = StringRef(Path).substr(0, OpenParen);
       StringRef MemberName =
           StringRef(Path).substr(OpenParen + 1, Path.size() - OpenParen - 2);
-      StringRef FullPath = Path;
       return getOrCreateObjectFromArchive(ArchivePath, MemberName, ArchName,
-                                          FullPath);
+                                          Path);
     }
   }
 

llvm/tools/llvm-symbolizer/Opts.td

@@ -15,7 +15,6 @@ class F<string name, string help>: Flag<["--"], name>, HelpText<help>;
 
 def grp_mach_o : OptionGroup<"kind">,
                  HelpText<"llvm-symbolizer Mach-O Specific Options">;
-def grp_symbolizer : OptionGroup<"Symbolizer Options">;
 def grp_gsym : OptionGroup<"kind">,
                HelpText<"llvm-symbolizer GSYM Related Options">;
 
@@ -31,8 +30,7 @@ def color_EQ : Joined<["--"], "color=">, HelpText<"Whether to use color when sym
 defm debug_file_directory : Eq<"debug-file-directory", "Path to directory where to look for debug files">, MetaVarName<"<dir>">;
 defm debuginfod : B<"debuginfod", "Use debuginfod to find debug binaries", "Don't use debuginfod to find debug binaries">;
 defm default_arch
-    : Eq<"default-arch", "Default architecture for multi-arch containers (Mach-O objects or AIX archives)">,
-      Group<grp_symbolizer>;
+    : Eq<"default-arch", "Default architecture for multi-arch containers (e.g. Mach-O objects or AIX archives)">;
 defm demangle : B<"demangle", "Demangle function names", "Don't demangle function names">;
 def disable_gsym : F<"disable-gsym", "Don't consider using GSYM files for symbolication">, Group<grp_gsym>;
 def filter_markup : Flag<["--"], "filter-markup">, HelpText<"Filter symbolizer markup from stdin.">;