summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--llvm/include/llvm/DebugInfo/CodeView/StreamRef.h12
-rw-r--r--llvm/tools/llvm-pdbdump/LLVMOutputStyle.cpp1
2 files changed, 6 insertions, 7 deletions
diff --git a/llvm/include/llvm/DebugInfo/CodeView/StreamRef.h b/llvm/include/llvm/DebugInfo/CodeView/StreamRef.h
index 22c4bdb5941..a4f244a3228 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 : private StreamInterface {
+class StreamRef {
public:
StreamRef() : Stream(nullptr), ViewOffset(0), Length(0) {}
StreamRef(const StreamInterface &Stream)
@@ -28,7 +28,7 @@ public:
StreamRef(const StreamRef &S, uint32_t Offset, uint32_t Length) = delete;
Error readBytes(uint32_t Offset, uint32_t Size,
- ArrayRef<uint8_t> &Buffer) const override {
+ ArrayRef<uint8_t> &Buffer) const {
if (ViewOffset + Offset < Offset)
return make_error<CodeViewError>(cv_error_code::insufficient_buffer);
if (Size + Offset > Length)
@@ -39,7 +39,7 @@ public:
// Given an offset into the stream, read as much as possible without copying
// any data.
Error readLongestContiguousChunk(uint32_t Offset,
- ArrayRef<uint8_t> &Buffer) const override {
+ ArrayRef<uint8_t> &Buffer) const {
if (Offset >= Length)
return make_error<CodeViewError>(cv_error_code::insufficient_buffer);
@@ -54,15 +54,15 @@ public:
return Error::success();
}
- Error writeBytes(uint32_t Offset, ArrayRef<uint8_t> Data) const override {
+ Error writeBytes(uint32_t Offset, ArrayRef<uint8_t> Data) const {
if (Data.size() + Offset > Length)
return make_error<CodeViewError>(cv_error_code::insufficient_buffer);
return Stream->writeBytes(ViewOffset + Offset, Data);
}
- uint32_t getLength() const override { return Length; }
+ uint32_t getLength() const { return Length; }
- Error commit() const override { return Stream->commit(); }
+ Error commit() const { return Stream->commit(); }
StreamRef drop_front(uint32_t N) const {
if (!Stream)
diff --git a/llvm/tools/llvm-pdbdump/LLVMOutputStyle.cpp b/llvm/tools/llvm-pdbdump/LLVMOutputStyle.cpp
index c24d364885d..d8eefa08377 100644
--- a/llvm/tools/llvm-pdbdump/LLVMOutputStyle.cpp
+++ b/llvm/tools/llvm-pdbdump/LLVMOutputStyle.cpp
@@ -344,7 +344,6 @@ static void dumpTpiHash(ScopedPrinter &P, TpiStream &Tpi) {
DictScope DD(P, "Hash");
P.printNumber("Number of Hash Buckets", Tpi.NumHashBuckets());
P.printNumber("Hash Key Size", Tpi.getHashKeySize());
- codeview::FixedStreamArray<support::ulittle32_t> S = Tpi.getHashValues();
P.printList("Values", Tpi.getHashValues());
P.printList("Type Index Offsets", Tpi.getTypeIndexOffsets(),
printTypeIndexOffset);
OpenPOWER on IntegriCloud