summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2014-10-07 19:09:05 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2014-10-07 19:09:05 +0000
commitd2c7fd82078573e8d06a28380cda65065228c356 (patch)
treecf1b0aabeba3440e683dc25f8fd2b664e13d48a7
parent80ebf8da7ed85e7cc3f04c1112e62a95b875a79d (diff)
downloadbcm5719-llvm-d2c7fd82078573e8d06a28380cda65065228c356.tar.gz
bcm5719-llvm-d2c7fd82078573e8d06a28380cda65065228c356.zip
Remove the IsVolatileSize parameter of getOpenFileSlice.
getOpenFileSlice gets passed the map size, so it makes no sense to say that the size is volatile. The code will not even compute the size. llvm-svn: 219226
-rw-r--r--llvm/include/llvm/Support/MemoryBuffer.h6
-rw-r--r--llvm/lib/Support/MemoryBuffer.cpp5
2 files changed, 4 insertions, 7 deletions
diff --git a/llvm/include/llvm/Support/MemoryBuffer.h b/llvm/include/llvm/Support/MemoryBuffer.h
index a8dc9d7613e..341850a538d 100644
--- a/llvm/include/llvm/Support/MemoryBuffer.h
+++ b/llvm/include/llvm/Support/MemoryBuffer.h
@@ -78,13 +78,9 @@ public:
/// Given an already-open file descriptor, map some slice of it into a
/// MemoryBuffer. The slice is specified by an \p Offset and \p MapSize.
/// Since this is in the middle of a file, the buffer is not null terminated.
- ///
- /// \param IsVolatileSize Set to true to indicate that the file size may be
- /// changing, e.g. when libclang tries to parse while the user is
- /// editing/updating the file.
static ErrorOr<std::unique_ptr<MemoryBuffer>>
getOpenFileSlice(int FD, const Twine &Filename, uint64_t MapSize,
- int64_t Offset, bool IsVolatileSize = false);
+ int64_t Offset);
/// Given an already-open file descriptor, read the file and return a
/// MemoryBuffer.
diff --git a/llvm/lib/Support/MemoryBuffer.cpp b/llvm/lib/Support/MemoryBuffer.cpp
index 9ccbcbf587d..a9ccf98f1b3 100644
--- a/llvm/lib/Support/MemoryBuffer.cpp
+++ b/llvm/lib/Support/MemoryBuffer.cpp
@@ -406,9 +406,10 @@ MemoryBuffer::getOpenFile(int FD, const Twine &Filename, uint64_t FileSize,
ErrorOr<std::unique_ptr<MemoryBuffer>>
MemoryBuffer::getOpenFileSlice(int FD, const Twine &Filename, uint64_t MapSize,
- int64_t Offset, bool IsVolatileSize) {
+ int64_t Offset) {
+ assert(MapSize != uint64_t(-1));
return getOpenFileImpl(FD, Filename, -1, MapSize, Offset, false,
- IsVolatileSize);
+ /*IsVolatileSize*/ false);
}
ErrorOr<std::unique_ptr<MemoryBuffer>> MemoryBuffer::getSTDIN() {
OpenPOWER on IntegriCloud