llvm · dwblaikie · May 16, 2025 · May 16, 2025 · May 16, 2025
diff --git a/...clude/llvm/DebugInfo/GSYM/GsymDIContext.h → ...include/llvm/DebugInfo/GSYM/GsymContext.h b/...clude/llvm/DebugInfo/GSYM/GsymDIContext.h → ...include/llvm/DebugInfo/GSYM/GsymContext.h
@@ -1,13 +1,13 @@
-//===-- GsymDIContext.h --------------------------------------------------===//
+//===-- GsymContext.h --------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===/

-#ifndef LLVM_DEBUGINFO_GSYM_GSYMDICONTEXT_H
-#define LLVM_DEBUGINFO_GSYM_GSYMDICONTEXT_H
+#ifndef LLVM_DEBUGINFO_GSYM_GSYMCONTEXT_H
+#define LLVM_DEBUGINFO_GSYM_GSYMCONTEXT_H

 #include "llvm/DebugInfo/DIContext.h"
 #include <cstdint>
@@ -27,12 +27,12 @@ class GsymReader;
 /// interface to different symbolication formats (e.g. GSYM, PDB and DWARF).
 /// More control and power over the debug information access can be had by using
 /// the GSYM interfaces directly.
-class GsymDIContext : public DIContext {
+class GsymContext : public DIContext {
 public:
-  GsymDIContext(std::unique_ptr<GsymReader> Reader);
+  GsymContext(std::unique_ptr<GsymReader> Reader);

-  GsymDIContext(GsymDIContext &) = delete;
-  GsymDIContext &operator=(GsymDIContext &) = delete;
+  GsymContext(GsymContext &) = delete;
+  GsymContext &operator=(GsymContext &) = delete;

  static bool classof(const DIContext *DICtx) {
    return DICtx->getKind() == CK_GSYM;
@@ -63,4 +63,4 @@ class GsymDIContext : public DIContext {

 } // end namespace llvm

-#endif // LLVM_DEBUGINFO_PDB_PDBCONTEXT_H
+#endif // LLVM_DEBUGINFO_GSYM_GSYMCONTEXT_H
diff --git a/llvm/lib/DebugInfo/GSYM/CMakeLists.txt b/llvm/lib/DebugInfo/GSYM/CMakeLists.txt
@@ -4,7 +4,7 @@ add_llvm_component_library(LLVMDebugInfoGSYM
  FileWriter.cpp
  FunctionInfo.cpp
  GsymCreator.cpp
-  GsymDIContext.cpp
+  GsymContext.cpp
  GsymReader.cpp
  InlineInfo.cpp
  LineTable.cpp

diff --git a/llvm/lib/DebugInfo/GSYM/GsymDIContext.cpp → llvm/lib/DebugInfo/GSYM/GsymContext.cpp b/llvm/lib/DebugInfo/GSYM/GsymDIContext.cpp → llvm/lib/DebugInfo/GSYM/GsymContext.cpp
@@ -1,23 +1,23 @@
-//===-- GsymDIContext.cpp ------------------------------------------------===//
+//===-- GsymContext.cpp ------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===/

-#include "llvm/DebugInfo/GSYM/GsymDIContext.h"
+#include "llvm/DebugInfo/GSYM/GsymContext.h"

 #include "llvm/DebugInfo/GSYM/GsymReader.h"
 #include "llvm/Support/Path.h"

 using namespace llvm;
 using namespace llvm::gsym;

-GsymDIContext::GsymDIContext(std::unique_ptr<GsymReader> Reader)
+GsymContext::GsymContext(std::unique_ptr<GsymReader> Reader)
    : DIContext(CK_GSYM), Reader(std::move(Reader)) {}

-void GsymDIContext::dump(raw_ostream &OS, DIDumpOptions DumpOpts) {}
+void GsymContext::dump(raw_ostream &OS, DIDumpOptions DumpOpts) {}

 static bool fillLineInfoFromLocation(const SourceLocation &Location,
                                     DILineInfoSpecifier Specifier,
@@ -61,8 +61,8 @@ static bool fillLineInfoFromLocation(const SourceLocation &Location,
 }

 std::optional<DILineInfo>
-GsymDIContext::getLineInfoForAddress(object::SectionedAddress Address,
-                                     DILineInfoSpecifier Specifier) {
+GsymContext::getLineInfoForAddress(object::SectionedAddress Address,
+                                   DILineInfoSpecifier Specifier) {
  if (Address.SectionIndex != object::SectionedAddress::UndefSection)
    return {};

@@ -93,16 +93,16 @@ GsymDIContext::getLineInfoForAddress(object::SectionedAddress Address,
 }

 std::optional<DILineInfo>
-GsymDIContext::getLineInfoForDataAddress(object::SectionedAddress Address) {
+GsymContext::getLineInfoForDataAddress(object::SectionedAddress Address) {
  // We can't implement this, there's no such information in the GSYM file.

  return {};
 }

 DILineInfoTable
-GsymDIContext::getLineInfoForAddressRange(object::SectionedAddress Address,
-                                          uint64_t Size,
-                                          DILineInfoSpecifier Specifier) {
+GsymContext::getLineInfoForAddressRange(object::SectionedAddress Address,
+                                        uint64_t Size,
+                                        DILineInfoSpecifier Specifier) {
  if (Size == 0)
    return DILineInfoTable();

@@ -131,8 +131,8 @@ GsymDIContext::getLineInfoForAddressRange(object::SectionedAddress Address,
 }

 DIInliningInfo
-GsymDIContext::getInliningInfoForAddress(object::SectionedAddress Address,
-                                         DILineInfoSpecifier Specifier) {
+GsymContext::getInliningInfoForAddress(object::SectionedAddress Address,
+                                       DILineInfoSpecifier Specifier) {
  auto ResultOrErr = Reader->lookup(Address.Address);

  if (!ResultOrErr)
@@ -159,7 +159,7 @@ GsymDIContext::getInliningInfoForAddress(object::SectionedAddress Address,
 }

 std::vector<DILocal>
-GsymDIContext::getLocalsForAddress(object::SectionedAddress Address) {
+GsymContext::getLocalsForAddress(object::SectionedAddress Address) {
  // We can't implement this, there's no such information in the GSYM file.

  return {};

diff --git a/llvm/lib/DebugInfo/Symbolize/Symbolize.cpp b/llvm/lib/DebugInfo/Symbolize/Symbolize.cpp
@@ -15,7 +15,7 @@
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/DebugInfo/BTF/BTFContext.h"
 #include "llvm/DebugInfo/DWARF/DWARFContext.h"
-#include "llvm/DebugInfo/GSYM/GsymDIContext.h"
+#include "llvm/DebugInfo/GSYM/GsymContext.h"
 #include "llvm/DebugInfo/GSYM/GsymReader.h"
 #include "llvm/DebugInfo/PDB/PDB.h"
 #include "llvm/DebugInfo/PDB/PDBContext.h"
@@ -665,7 +665,7 @@ LLVMSymbolizer::getOrCreateModuleInfo(StringRef ModuleName) {
  // If this is a COFF object containing PDB info and not containing DWARF
  // section, use a PDBContext to symbolize. Otherwise, use DWARF.
  // Create a DIContext to symbolize as follows:
-  // - If there is a GSYM file, create a GsymDIContext.
+  // - If there is a GSYM file, create a GsymContext.
  // - Otherwise, if this is a COFF object containing PDB info, create a
  // PDBContext.
  // - Otherwise, create a DWARFContext.
@@ -677,7 +677,7 @@ LLVMSymbolizer::getOrCreateModuleInfo(StringRef ModuleName) {
      std::unique_ptr<gsym::GsymReader> Reader =
          std::make_unique<gsym::GsymReader>(std::move(*ReaderOrErr));

-      Context = std::make_unique<gsym::GsymDIContext>(std::move(Reader));
+      Context = std::make_unique<gsym::GsymContext>(std::move(Reader));
    }
  }
  if (!Context) {

diff --git a/llvm/utils/gn/secondary/llvm/lib/DebugInfo/GSYM/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/DebugInfo/GSYM/BUILD.gn
@@ -12,7 +12,7 @@ static_library("GSYM") {
    "FileWriter.cpp",
    "FunctionInfo.cpp",
    "GsymCreator.cpp",
-    "GsymDIContext.cpp",
+    "GsymContext.cpp",
    "GsymReader.cpp",
    "Header.cpp",
    "InlineInfo.cpp",