diff options
6 files changed, 13 insertions, 10 deletions
diff --git a/llvm/include/llvm/DebugInfo/CodeView/CVRecord.h b/llvm/include/llvm/DebugInfo/CodeView/CVRecord.h index 39d92ffb568..e9e595fabb8 100644 --- a/llvm/include/llvm/DebugInfo/CodeView/CVRecord.h +++ b/llvm/include/llvm/DebugInfo/CodeView/CVRecord.h @@ -27,7 +27,7 @@ template <typename Kind> struct CVRecord { }; template <typename Kind> struct VarStreamArrayExtractor<CVRecord<Kind>> { - Error operator()(const StreamInterface &Stream, uint32_t &Len, + Error operator()(StreamRef Stream, uint32_t &Len, CVRecord<Kind> &Item) const { const RecordPrefix *Prefix = nullptr; StreamReader Reader(Stream); diff --git a/llvm/include/llvm/DebugInfo/CodeView/StreamArray.h b/llvm/include/llvm/DebugInfo/CodeView/StreamArray.h index 7b8278ec83e..fcb941942d8 100644 --- a/llvm/include/llvm/DebugInfo/CodeView/StreamArray.h +++ b/llvm/include/llvm/DebugInfo/CodeView/StreamArray.h @@ -29,8 +29,7 @@ template <typename T> struct VarStreamArrayExtractor { // with the following method implemented. On output return `Len` should // contain the number of bytes to consume from the stream, and `Item` should // be initialized with the proper value. - Error operator()(const StreamInterface &Stream, uint32_t &Len, - T &Item) const = delete; + Error operator()(StreamRef Stream, uint32_t &Len, T &Item) const = delete; }; /// VarStreamArray represents an array of variable length records backed by a diff --git a/llvm/include/llvm/DebugInfo/CodeView/StreamReader.h b/llvm/include/llvm/DebugInfo/CodeView/StreamReader.h index 54fecaa9bd9..c8dd6e5760d 100644 --- a/llvm/include/llvm/DebugInfo/CodeView/StreamReader.h +++ b/llvm/include/llvm/DebugInfo/CodeView/StreamReader.h @@ -26,7 +26,7 @@ class StreamRef; class StreamReader { public: - StreamReader(const StreamInterface &S); + StreamReader(StreamRef Stream); Error readBytes(ArrayRef<uint8_t> &Buffer, uint32_t Size); Error readInteger(uint16_t &Dest); @@ -72,7 +72,7 @@ public: return make_error<CodeViewError>(cv_error_code::corrupt_record); if (Offset + Length > Stream.getLength()) return make_error<CodeViewError>(cv_error_code::insufficient_buffer); - StreamRef View(Stream, Offset, Length); + StreamRef View = Stream.slice(Offset, Length); Array = FixedStreamArray<T>(View); Offset += Length; return Error::success(); @@ -84,7 +84,7 @@ public: uint32_t bytesRemaining() const { return getLength() - getOffset(); } private: - const StreamInterface &Stream; + StreamRef Stream; uint32_t Offset; }; } // namespace codeview diff --git a/llvm/include/llvm/DebugInfo/CodeView/StreamRef.h b/llvm/include/llvm/DebugInfo/CodeView/StreamRef.h index 01b19138398..b1643817472 100644 --- a/llvm/include/llvm/DebugInfo/CodeView/StreamRef.h +++ b/llvm/include/llvm/DebugInfo/CodeView/StreamRef.h @@ -16,7 +16,7 @@ namespace llvm { namespace codeview { -class StreamRef : public StreamInterface { +class StreamRef : private StreamInterface { public: StreamRef() : Stream(nullptr), ViewOffset(0), Length(0) {} StreamRef(const StreamInterface &Stream) @@ -50,6 +50,10 @@ public: return StreamRef(*Stream, ViewOffset, N); } + StreamRef slice(uint32_t Offset, uint32_t Len) const { + return drop_front(Offset).keep_front(Len); + } + bool operator==(const StreamRef &Other) const { if (Stream != Other.Stream) return false; diff --git a/llvm/include/llvm/DebugInfo/PDB/Raw/ModInfo.h b/llvm/include/llvm/DebugInfo/PDB/Raw/ModInfo.h index cd7f2cf41a4..b8da0bfabf3 100644 --- a/llvm/include/llvm/DebugInfo/PDB/Raw/ModInfo.h +++ b/llvm/include/llvm/DebugInfo/PDB/Raw/ModInfo.h @@ -64,7 +64,7 @@ struct ModuleInfoEx { namespace codeview { template <> struct VarStreamArrayExtractor<pdb::ModInfo> { - Error operator()(const StreamInterface &Stream, uint32_t &Length, + Error operator()(StreamRef Stream, uint32_t &Length, pdb::ModInfo &Info) const { if (auto EC = pdb::ModInfo::initialize(Stream, Info)) return EC; diff --git a/llvm/lib/DebugInfo/CodeView/StreamReader.cpp b/llvm/lib/DebugInfo/CodeView/StreamReader.cpp index 94a6183cd8a..2adf9487e5d 100644 --- a/llvm/lib/DebugInfo/CodeView/StreamReader.cpp +++ b/llvm/lib/DebugInfo/CodeView/StreamReader.cpp @@ -15,7 +15,7 @@ using namespace llvm; using namespace llvm::codeview; -StreamReader::StreamReader(const StreamInterface &S) : Stream(S), Offset(0) {} +StreamReader::StreamReader(StreamRef Stream) : Stream(Stream), Offset(0) {} Error StreamReader::readBytes(ArrayRef<uint8_t> &Buffer, uint32_t Size) { if (auto EC = Stream.readBytes(Offset, Size, Buffer)) @@ -80,7 +80,7 @@ Error StreamReader::readStreamRef(StreamRef &Ref) { Error StreamReader::readStreamRef(StreamRef &Ref, uint32_t Length) { if (bytesRemaining() < Length) return make_error<CodeViewError>(cv_error_code::insufficient_buffer); - Ref = StreamRef(Stream, Offset, Length); + Ref = Stream.slice(Offset, Length); Offset += Length; return Error::success(); } |
