diff options
author | Michael Spencer <bigcheesegs@gmail.com> | 2020-04-08 20:29:39 -0700 |
---|---|---|
committer | Michael Spencer <bigcheesegs@gmail.com> | 2020-04-15 14:17:51 -0700 |
commit | 92e8af0ecbe7eb36bc03a211afa9151c81b7b531 (patch) | |
tree | 4a288257c6eba1e531040c77d7c51874abd6234d /llvm/lib/Support/MemoryBuffer.cpp | |
parent | 1eac2c55d861dfc6d88308ad97c242cbd60e5da1 (diff) | |
download | llvm-92e8af0ecbe7eb36bc03a211afa9151c81b7b531.zip llvm-92e8af0ecbe7eb36bc03a211afa9151c81b7b531.tar.gz llvm-92e8af0ecbe7eb36bc03a211afa9151c81b7b531.tar.bz2 |
[Clang] Expose RequiresNullTerminator in FileManager.
This is needed to fix the reason
0a2be46cfdb698fe (Modules: Invalidate out-of-date PCMs as they're
discovered) and 5b44a4b07fc1d ([modules] Do not cache invalid state for
modules that we attempted to load.) were reverted.
These patches changed Clang to use `isVolatile` when loading modules.
This had the side effect of not using mmap when loading modules, and
thus greatly increased memory usage.
The reason it wasn't using mmap is because `MemoryBuffer` plays some
games with file size when you request null termination, and it has to
disable these when `isVolatile` is set as the size may change by the
time it's mmapped. Clang by default passes
`RequiresNullTerminator = true`, and `shouldUseMmap` ignored if
`RequiresNullTerminator` was even requested.
This patch adds `RequiresNullTerminator` to the `FileManager` interface
so Clang can use it when loading modules, and changes `shouldUseMmap` to
only take volatility into account if `RequiresNullTerminator` is true.
This is fine as both `mmap` and a `read` loop are vulnerable to
modifying the file while reading, but are immune to the rename Clang
does when replacing a module file.
Differential Revision: https://reviews.llvm.org/D77772
Diffstat (limited to 'llvm/lib/Support/MemoryBuffer.cpp')
-rw-r--r-- | llvm/lib/Support/MemoryBuffer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/Support/MemoryBuffer.cpp b/llvm/lib/Support/MemoryBuffer.cpp index e467daf..248fb72 100644 --- a/llvm/lib/Support/MemoryBuffer.cpp +++ b/llvm/lib/Support/MemoryBuffer.cpp @@ -329,7 +329,7 @@ static bool shouldUseMmap(sys::fs::file_t FD, // mmap may leave the buffer without null terminator if the file size changed // by the time the last page is mapped in, so avoid it if the file size is // likely to change. - if (IsVolatile) + if (IsVolatile && RequiresNullTerminator) return false; // We don't use mmap for small files because this can severely fragment our |