From 6605187103a2369418d014a7f146fee4a04b11bf Mon Sep 17 00:00:00 2001 From: Daniel Thornburgh Date: Thu, 21 Jul 2022 12:00:15 -0700 Subject: [PATCH] [NFC] Fix compiler warning in MarkupFilter --- llvm/include/llvm/DebugInfo/Symbolize/MarkupFilter.h | 4 ++-- llvm/lib/DebugInfo/Symbolize/MarkupFilter.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/llvm/include/llvm/DebugInfo/Symbolize/MarkupFilter.h b/llvm/include/llvm/DebugInfo/Symbolize/MarkupFilter.h index a224c32..2668614 100644 --- a/llvm/include/llvm/DebugInfo/Symbolize/MarkupFilter.h +++ b/llvm/include/llvm/DebugInfo/Symbolize/MarkupFilter.h @@ -52,7 +52,7 @@ private: struct MMap { uint64_t Addr; uint64_t Size; - const Module *Module; + const Module *Mod; std::string Mode; // Lowercase uint64_t ModuleRelativeAddr; @@ -62,7 +62,7 @@ private: // An informational module line currently being constructed. As many mmap // elements as possible are folded into one ModuleInfo line. struct ModuleInfoLine { - const Module *Module; + const Module *Mod; SmallVector MMaps = {}; }; diff --git a/llvm/lib/DebugInfo/Symbolize/MarkupFilter.cpp b/llvm/lib/DebugInfo/Symbolize/MarkupFilter.cpp index ad21df6..ce42bbf 100644 --- a/llvm/lib/DebugInfo/Symbolize/MarkupFilter.cpp +++ b/llvm/lib/DebugInfo/Symbolize/MarkupFilter.cpp @@ -96,7 +96,7 @@ bool MarkupFilter::tryMMap(const MarkupNode &Node, if (const MMap *M = overlappingMMap(*ParsedMMap)) { WithColor::error(errs()) - << formatv("overlapping mmap: #{0:x} [{1:x},{2:x})\n", M->Module->ID, + << formatv("overlapping mmap: #{0:x} [{1:x},{2:x})\n", M->Mod->ID, M->Addr, M->Addr + M->Size); reportLocation(Node.Fields[0].begin()); return true; @@ -106,11 +106,11 @@ bool MarkupFilter::tryMMap(const MarkupNode &Node, assert(Res.second && "Overlap check should ensure emplace succeeds."); MMap &MMap = Res.first->second; - if (!MIL || MIL->Module != MMap.Module) { + if (!MIL || MIL->Mod != MMap.Mod) { endAnyModuleInfoLine(); for (const MarkupNode &Node : DeferredNodes) filterNode(Node); - beginModuleInfoLine(MMap.Module); + beginModuleInfoLine(MMap.Mod); OS << "; adds"; } MIL->MMaps.push_back(&MMap); -- 2.7.4