diff options
Diffstat (limited to 'llvm/include')
6 files changed, 29 insertions, 27 deletions
diff --git a/llvm/include/llvm/DebugInfo/CodeView/ModuleDebugFileChecksumFragment.h b/llvm/include/llvm/DebugInfo/CodeView/ModuleDebugFileChecksumFragment.h index b28f3fbef8c..98e6a54cf82 100644 --- a/llvm/include/llvm/DebugInfo/CodeView/ModuleDebugFileChecksumFragment.h +++ b/llvm/include/llvm/DebugInfo/CodeView/ModuleDebugFileChecksumFragment.h @@ -1,4 +1,4 @@ -//===- ModuleDebugLineFragment.h --------------------------------*- C++ -*-===// +//===- ModuleDebugFileChecksumFragment.h ------------------------*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -39,15 +39,15 @@ public: namespace llvm { namespace codeview { -class ModuleDebugFileChecksumFragment final : public ModuleDebugFragment { - typedef VarStreamArray<FileChecksumEntry> FileChecksumArray; +class ModuleDebugFileChecksumFragmentRef final : public ModuleDebugFragmentRef { + typedef VarStreamArray<codeview::FileChecksumEntry> FileChecksumArray; typedef FileChecksumArray::Iterator Iterator; public: - ModuleDebugFileChecksumFragment() - : ModuleDebugFragment(ModuleDebugFragmentKind::FileChecksums) {} + ModuleDebugFileChecksumFragmentRef() + : ModuleDebugFragmentRef(ModuleDebugFragmentKind::FileChecksums) {} - static bool classof(const ModuleDebugFragment *S) { + static bool classof(const ModuleDebugFragmentRef *S) { return S->kind() == ModuleDebugFragmentKind::FileChecksums; } diff --git a/llvm/include/llvm/DebugInfo/CodeView/ModuleDebugFragment.h b/llvm/include/llvm/DebugInfo/CodeView/ModuleDebugFragment.h index 98d587f6521..f8b60c094ce 100644 --- a/llvm/include/llvm/DebugInfo/CodeView/ModuleDebugFragment.h +++ b/llvm/include/llvm/DebugInfo/CodeView/ModuleDebugFragment.h @@ -16,11 +16,11 @@ namespace llvm { namespace codeview { -class ModuleDebugFragment { +class ModuleDebugFragmentRef { public: - explicit ModuleDebugFragment(ModuleDebugFragmentKind Kind) : Kind(Kind) {} + explicit ModuleDebugFragmentRef(ModuleDebugFragmentKind Kind) : Kind(Kind) {} + virtual ~ModuleDebugFragmentRef(); - virtual ~ModuleDebugFragment(); ModuleDebugFragmentKind kind() const { return Kind; } protected: diff --git a/llvm/include/llvm/DebugInfo/CodeView/ModuleDebugFragmentVisitor.h b/llvm/include/llvm/DebugInfo/CodeView/ModuleDebugFragmentVisitor.h index bcde565f6de..90da3e03a15 100644 --- a/llvm/include/llvm/DebugInfo/CodeView/ModuleDebugFragmentVisitor.h +++ b/llvm/include/llvm/DebugInfo/CodeView/ModuleDebugFragmentVisitor.h @@ -17,24 +17,25 @@ namespace llvm { namespace codeview { -class ModuleDebugFileChecksumFragment; +class ModuleDebugFileChecksumFragmentRef; class ModuleDebugFragmentRecord; -class ModuleDebugInlineeLineFragment; -class ModuleDebugLineFragment; -class ModuleDebugUnknownFragment; +class ModuleDebugInlineeLineFragmentRef; +class ModuleDebugLineFragmentRef; +class ModuleDebugUnknownFragmentRef; class ModuleDebugFragmentVisitor { public: virtual ~ModuleDebugFragmentVisitor() = default; - virtual Error visitUnknown(ModuleDebugUnknownFragment &Unknown) { + virtual Error visitUnknown(ModuleDebugUnknownFragmentRef &Unknown) { return Error::success(); } - virtual Error visitLines(ModuleDebugLineFragment &Lines) { + virtual Error visitLines(ModuleDebugLineFragmentRef &Lines) { return Error::success(); } - virtual Error visitFileChecksums(ModuleDebugFileChecksumFragment &Checksums) { + virtual Error + visitFileChecksums(ModuleDebugFileChecksumFragmentRef &Checksums) { return Error::success(); } diff --git a/llvm/include/llvm/DebugInfo/CodeView/ModuleDebugLineFragment.h b/llvm/include/llvm/DebugInfo/CodeView/ModuleDebugLineFragment.h index 8b6ae6408a9..6268349d21b 100644 --- a/llvm/include/llvm/DebugInfo/CodeView/ModuleDebugLineFragment.h +++ b/llvm/include/llvm/DebugInfo/CodeView/ModuleDebugLineFragment.h @@ -63,15 +63,15 @@ public: LineColumnEntry &Item, const LineFragmentHeader *Header); }; -class ModuleDebugLineFragment final : public ModuleDebugFragment { +class ModuleDebugLineFragmentRef final : public ModuleDebugFragmentRef { friend class LineColumnExtractor; typedef VarStreamArray<LineColumnEntry, LineColumnExtractor> LineInfoArray; typedef LineInfoArray::Iterator Iterator; public: - ModuleDebugLineFragment(); + ModuleDebugLineFragmentRef(); - static bool classof(const ModuleDebugFragment *S) { + static bool classof(const ModuleDebugFragmentRef *S) { return S->kind() == ModuleDebugFragmentKind::Lines; } diff --git a/llvm/include/llvm/DebugInfo/CodeView/ModuleDebugUnknownFragment.h b/llvm/include/llvm/DebugInfo/CodeView/ModuleDebugUnknownFragment.h index bb764b6ea66..b8c1c02e5cf 100644 --- a/llvm/include/llvm/DebugInfo/CodeView/ModuleDebugUnknownFragment.h +++ b/llvm/include/llvm/DebugInfo/CodeView/ModuleDebugUnknownFragment.h @@ -16,10 +16,11 @@ namespace llvm { namespace codeview { -class ModuleDebugUnknownFragment final : public ModuleDebugFragment { +class ModuleDebugUnknownFragmentRef final : public ModuleDebugFragmentRef { public: - ModuleDebugUnknownFragment(ModuleDebugFragmentKind Kind, BinaryStreamRef Data) - : ModuleDebugFragment(Kind), Data(Data) {} + ModuleDebugUnknownFragmentRef(ModuleDebugFragmentKind Kind, + BinaryStreamRef Data) + : ModuleDebugFragmentRef(Kind), Data(Data) {} BinaryStreamRef getData() const { return Data; } diff --git a/llvm/include/llvm/DebugInfo/PDB/Native/ModuleDebugStream.h b/llvm/include/llvm/DebugInfo/PDB/Native/ModuleDebugStream.h index 2093691c453..2c95690ed58 100644 --- a/llvm/include/llvm/DebugInfo/PDB/Native/ModuleDebugStream.h +++ b/llvm/include/llvm/DebugInfo/PDB/Native/ModuleDebugStream.h @@ -24,14 +24,14 @@ namespace pdb { class PDBFile; class DbiModuleDescriptor; -class ModuleDebugStream { +class ModuleDebugStreamRef { typedef codeview::ModuleDebugFragmentArray::Iterator LinesAndChecksumsIterator; public: - ModuleDebugStream(const DbiModuleDescriptor &Module, - std::unique_ptr<msf::MappedBlockStream> Stream); - ~ModuleDebugStream(); + ModuleDebugStreamRef(const DbiModuleDescriptor &Module, + std::unique_ptr<msf::MappedBlockStream> Stream); + ~ModuleDebugStreamRef(); Error reload(); @@ -54,7 +54,7 @@ private: std::unique_ptr<msf::MappedBlockStream> Stream; codeview::CVSymbolArray SymbolsSubstream; - BinaryStreamRef LinesSubstream; + BinaryStreamRef C11LinesSubstream; BinaryStreamRef C13LinesSubstream; BinaryStreamRef GlobalRefsSubstream; |

