summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 361eafa)
raw | patch | inline | side by side (parent: 361eafa)
author | Rafael Espindola <rafael.espindola@gmail.com> | |
Fri, 21 Nov 2014 05:15:41 +0000 (05:15 +0000) | ||
committer | Rafael Espindola <rafael.espindola@gmail.com> | |
Fri, 21 Nov 2014 05:15:41 +0000 (05:15 +0000) |
The logic for detecting EOF was wrong and would fail if we ever requested
more than 16k past the last read position.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@222505 91177308-0d34-0410-b5e6-96231b3b80d8
more than 16k past the last read position.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@222505 91177308-0d34-0410-b5e6-96231b3b80d8
include/llvm/Support/StreamingMemoryObject.h | patch | blob | history | |
unittests/Support/CMakeLists.txt | patch | blob | history | |
unittests/Support/StreamingMemoryObject.cpp | [new file with mode: 0644] | patch | blob |
diff --git a/include/llvm/Support/StreamingMemoryObject.h b/include/llvm/Support/StreamingMemoryObject.h
index 6957c6e41ac8fe9c40a2a26d110d77fe7d8fe9bd..66ed521a411c753fdeb0e23f02363de1dd6ca3c2 100644 (file)
// Most of the requests will be small, but we fetch at kChunkSize bytes
// at a time to avoid making too many potentially expensive GetBytes calls
bool fetchToPos(size_t Pos) const {
- if (EOFReached) return Pos < ObjectSize;
+ if (EOFReached)
+ return Pos < ObjectSize;
while (Pos >= BytesRead) {
Bytes.resize(BytesRead + BytesSkipped + kChunkSize);
size_t bytes = Streamer->GetBytes(&Bytes[BytesRead + BytesSkipped],
kChunkSize);
BytesRead += bytes;
- if (BytesRead <= Pos) { // reached EOF/ran out of bytes
+ if (bytes != kChunkSize) { // reached EOF/ran out of bytes
ObjectSize = BytesRead;
EOFReached = true;
- return false;
+ break;
}
}
- return true;
+ return Pos < BytesRead;
}
StreamingMemoryObject(const StreamingMemoryObject&) LLVM_DELETED_FUNCTION;
index 7abdd8ab82b67f956e8a256f975311f63421fad6..dd270ccea42de297b1fc515aaeb8209ade11d5a9 100644 (file)
ScaledNumberTest.cpp
SourceMgrTest.cpp
SpecialCaseListTest.cpp
+ StreamingMemoryObject.cpp
StringPool.cpp
SwapByteOrderTest.cpp
ThreadLocalTest.cpp
diff --git a/unittests/Support/StreamingMemoryObject.cpp b/unittests/Support/StreamingMemoryObject.cpp
--- /dev/null
@@ -0,0 +1,30 @@
+//===- llvm/unittest/Support/StreamingMemoryObject.cpp - unit tests -------===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "llvm/Support/StreamingMemoryObject.h"
+#include "gtest/gtest.h"
+
+#include <string.h>
+
+using namespace llvm;
+
+namespace {
+class NullDataStreamer : public DataStreamer {
+ size_t GetBytes(unsigned char *buf, size_t len) override {
+ memset(buf, 0, len);
+ return len;
+ }
+};
+}
+
+TEST(StreamingMemoryObject, Test) {
+ auto *DS = new NullDataStreamer();
+ StreamingMemoryObject O(DS);
+ EXPECT_TRUE(O.isValidAddress(32 * 1024));
+}