Address [Some] Feedback Nr 3 - Rest pending YAML format

Author: Alex B

llvm/include/llvm/DebugInfo/GSYM/CallSiteInfo.h

@@ -9,24 +9,17 @@
 #ifndef LLVM_DEBUGINFO_GSYM_CALLSITEINFO_H
 #define LLVM_DEBUGINFO_GSYM_CALLSITEINFO_H
 
-#include "llvm/ADT/DenseMap.h"
+#include "llvm/ADT/BitmaskEnum.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/StringSet.h"
-#include "llvm/DebugInfo/GSYM/ExtractRanges.h"
-#include "llvm/Support/YAMLParser.h"
-#include <string>
-#include <unordered_map>
+#include "llvm/Support/Error.h"
 #include <vector>
 
 namespace llvm {
 class DataExtractor;
 class raw_ostream;
-class StringTableBuilder;
-class CachedHashStringRef;
 
 namespace yaml {
-struct CallSiteYAML;
-struct FunctionYAML;
 struct FunctionsYAML;
 } // namespace yaml
 
@@ -43,6 +36,8 @@ struct CallSiteInfo {
     // This flag specifies that the call site can only call a function outside
     // the link unit that the call site is in.
     ExternalCall = 1 << 1,
+
+    LLVM_MARK_AS_BITMASK_ENUM(/*LargestValue*/ ExternalCall),
   };
 
   /// The return address of the call site.
@@ -90,11 +85,7 @@ class CallSiteInfoLoader {
   /// Constructor that initializes the CallSiteInfoLoader with necessary data
   /// structures.
   ///
-  /// \param StringOffsetMap A reference to a DenseMap that maps existing string
-  /// offsets to CachedHashStringRef.
-  /// \param StrTab A reference to a StringTableBuilder used for managing
-  /// looking up and creating new strings. \param StringStorage A reference to a
-  /// StringSet for storing the data for generated strings.
+  /// \param GCreator A reference to the GsymCreator.
   CallSiteInfoLoader(GsymCreator &GCreator) : GCreator(GCreator) {}
 
   /// This method reads the specified YAML file, parses its content, and updates

llvm/lib/DebugInfo/GSYM/CallSiteInfo.cpp

@@ -159,9 +159,9 @@ Error CallSiteInfoLoader::loadYAML(std::vector<FunctionInfo> &Funcs,
   std::unique_ptr<MemoryBuffer> Buffer = std::move(*BufferOrError);
 
   // Step 2: Parse YAML content
-  yaml::FunctionsYAML functionsYAML;
+  yaml::FunctionsYAML FuncsYAML;
   yaml::Input yin(Buffer->getMemBufferRef());
-  yin >> functionsYAML;
+  yin >> FuncsYAML;
   if (yin.error())
     return createStringError(yin.error(), "Error parsing YAML file: %s\n",
                              Buffer->getBufferIdentifier().str().c_str());
@@ -170,7 +170,7 @@ Error CallSiteInfoLoader::loadYAML(std::vector<FunctionInfo> &Funcs,
   auto FuncMap = buildFunctionMap(Funcs);
 
   // Step 4: Process parsed YAML functions and update FuncMap
-  return processYAMLFunctions(functionsYAML, FuncMap);
+  return processYAMLFunctions(FuncsYAML, FuncMap);
 }
 
 StringMap<FunctionInfo *>

llvm/lib/DebugInfo/GSYM/FunctionInfo.cpp

@@ -218,9 +218,9 @@ llvm::Expected<uint64_t> FunctionInfo::encode(FileWriter &Out,
     // writing the CallSites out with the number of bytes that were written.
     Out.writeU32(0);
     const auto StartOffset = Out.tell();
-    llvm::Error err = CallSites->encode(Out);
-    if (err)
-      return std::move(err);
+    Error Err = CallSites->encode(Out);
+    if (Err)
+      return std::move(Err);
     const auto Length = Out.tell() - StartOffset;
     if (Length > UINT32_MAX)
       return createStringError(std::errc::invalid_argument,