Author: Duncan P. N. Exon Smith Date: 2020-12-08T17:33:46-08:00 New Revision: a22eda548b8e1f9362018dec194af0ca91b35da0
URL: https://github.com/llvm/llvm-project/commit/a22eda548b8e1f9362018dec194af0ca91b35da0 DIFF: https://github.com/llvm/llvm-project/commit/a22eda548b8e1f9362018dec194af0ca91b35da0.diff LOG: VFS: Return new file systems as uniquely owned when possible, almost NFC Uniformly return uniquely-owned filesystems from VFS creation APIs. The one exception is `getRealFileSystem`, which has a single instance and needs to be shared. This is almost NFC, except that it fixes a memory leak in `vfs::collectVFSFromYAML()`. Depends on https://reviews.llvm.org/D92888 Differential Revision: https://reviews.llvm.org/D92890 Added: Modified: llvm/include/llvm/Support/VirtualFileSystem.h llvm/lib/Support/VirtualFileSystem.cpp llvm/unittests/Support/VirtualFileSystemTest.cpp Removed: ################################################################################ diff --git a/llvm/include/llvm/Support/VirtualFileSystem.h b/llvm/include/llvm/Support/VirtualFileSystem.h index 714bd7ed3050..f5290f0c6a98 100644 --- a/llvm/include/llvm/Support/VirtualFileSystem.h +++ b/llvm/include/llvm/Support/VirtualFileSystem.h @@ -500,7 +500,7 @@ llvm::sys::fs::UniqueID getNextVirtualUniqueID(); /// Gets a \p FileSystem for a virtual file system described in YAML /// format. -IntrusiveRefCntPtr<FileSystem> +std::unique_ptr<FileSystem> getVFSFromYAML(std::unique_ptr<llvm::MemoryBuffer> Buffer, llvm::SourceMgr::DiagHandlerTy DiagHandler, StringRef YAMLFilePath, void *DiagContext = nullptr, @@ -726,7 +726,7 @@ class RedirectingFileSystem : public vfs::FileSystem { /// Parses \p Buffer, which is expected to be in YAML format and /// returns a virtual file system representing its contents. - static RedirectingFileSystem * + static std::unique_ptr<RedirectingFileSystem> create(std::unique_ptr<MemoryBuffer> Buffer, SourceMgr::DiagHandlerTy DiagHandler, StringRef YAMLFilePath, void *DiagContext, IntrusiveRefCntPtr<FileSystem> ExternalFS); diff --git a/llvm/lib/Support/VirtualFileSystem.cpp b/llvm/lib/Support/VirtualFileSystem.cpp index 697383d55d88..de2499295daa 100644 --- a/llvm/lib/Support/VirtualFileSystem.cpp +++ b/llvm/lib/Support/VirtualFileSystem.cpp @@ -1639,7 +1639,7 @@ class llvm::vfs::RedirectingFileSystemParser { } }; -RedirectingFileSystem * +std::unique_ptr<RedirectingFileSystem> RedirectingFileSystem::create(std::unique_ptr<MemoryBuffer> Buffer, SourceMgr::DiagHandlerTy DiagHandler, StringRef YAMLFilePath, void *DiagContext, @@ -1679,7 +1679,7 @@ RedirectingFileSystem::create(std::unique_ptr<MemoryBuffer> Buffer, if (!P.parse(Root, FS.get())) return nullptr; - return FS.release(); + return FS; } ErrorOr<RedirectingFileSystem::Entry *> @@ -1861,7 +1861,7 @@ RedirectingFileSystem::getRealPath(const Twine &Path, : llvm::errc::invalid_argument; } -IntrusiveRefCntPtr<FileSystem> +std::unique_ptr<FileSystem> vfs::getVFSFromYAML(std::unique_ptr<MemoryBuffer> Buffer, SourceMgr::DiagHandlerTy DiagHandler, StringRef YAMLFilePath, void *DiagContext, @@ -1902,7 +1902,7 @@ void vfs::collectVFSFromYAML(std::unique_ptr<MemoryBuffer> Buffer, SmallVectorImpl<YAMLVFSEntry> &CollectedEntries, void *DiagContext, IntrusiveRefCntPtr<FileSystem> ExternalFS) { - RedirectingFileSystem *VFS = RedirectingFileSystem::create( + std::unique_ptr<RedirectingFileSystem> VFS = RedirectingFileSystem::create( std::move(Buffer), DiagHandler, YAMLFilePath, DiagContext, std::move(ExternalFS)); ErrorOr<RedirectingFileSystem::Entry *> RootE = VFS->lookupPath("/"); diff --git a/llvm/unittests/Support/VirtualFileSystemTest.cpp b/llvm/unittests/Support/VirtualFileSystemTest.cpp index 4cc209de1a50..1b574b36d36b 100644 --- a/llvm/unittests/Support/VirtualFileSystemTest.cpp +++ b/llvm/unittests/Support/VirtualFileSystemTest.cpp @@ -1292,7 +1292,7 @@ class VFSFromYAMLTest : public ::testing::Test { ++Test->NumDiagnostics; } - IntrusiveRefCntPtr<vfs::FileSystem> + std::unique_ptr<vfs::FileSystem> getFromYAMLRawString(StringRef Content, IntrusiveRefCntPtr<vfs::FileSystem> ExternalFS) { std::unique_ptr<MemoryBuffer> Buffer = MemoryBuffer::getMemBuffer(Content); @@ -1300,7 +1300,7 @@ class VFSFromYAMLTest : public ::testing::Test { ExternalFS); } - IntrusiveRefCntPtr<vfs::FileSystem> getFromYAMLString( + std::unique_ptr<vfs::FileSystem> getFromYAMLString( StringRef Content, IntrusiveRefCntPtr<vfs::FileSystem> ExternalFS = new DummyFileSystem()) { std::string VersionPlusContent("{\n 'version':0,\n"); _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
