[PATCH] D64113: [VFS] Add reverse iterator to OverlayFileSystem
Jonas Devlieghere via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Tue Jul 2 17:38:52 PDT 2019
JDevlieghere updated this revision to Diff 207670.
JDevlieghere added a comment.
Herald added a subscriber: ormris.
Add unit test for both iterators
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D64113/new/
https://reviews.llvm.org/D64113
Files:
llvm/include/llvm/Support/VirtualFileSystem.h
llvm/unittests/Support/VirtualFileSystemTest.cpp
Index: llvm/unittests/Support/VirtualFileSystemTest.cpp
===================================================================
--- llvm/unittests/Support/VirtualFileSystemTest.cpp
+++ llvm/unittests/Support/VirtualFileSystemTest.cpp
@@ -342,6 +342,57 @@
EXPECT_EQ(0200, Status->getPermissions());
}
+TEST(VirtualFileSystemTest, OverlayIterator) {
+ IntrusiveRefCntPtr<DummyFileSystem> Lower(new DummyFileSystem());
+ Lower->addRegularFile("/foo");
+ IntrusiveRefCntPtr<DummyFileSystem> Upper(new DummyFileSystem());
+
+ IntrusiveRefCntPtr<vfs::OverlayFileSystem> O(
+ new vfs::OverlayFileSystem(Lower));
+ O->pushOverlay(Upper);
+
+ ErrorOr<vfs::Status> Status((std::error_code()));
+ {
+ auto it = O->overlays_begin();
+ auto end = O->overlays_end();
+
+ EXPECT_NE(it, end);
+
+ Status = (*it)->status("/foo");
+ ASSERT_TRUE(Status.getError());
+
+ it++;
+ EXPECT_NE(it, end);
+
+ Status = (*it)->status("/foo");
+ ASSERT_FALSE(Status.getError());
+ EXPECT_TRUE(Status->exists());
+
+ it++;
+ EXPECT_EQ(it, end);
+ }
+
+ {
+ auto it = O->overlays_rbegin();
+ auto end = O->overlays_rend();
+
+ EXPECT_NE(it, end);
+
+ Status = (*it)->status("/foo");
+ ASSERT_FALSE(Status.getError());
+ EXPECT_TRUE(Status->exists());
+
+ it++;
+ EXPECT_NE(it, end);
+
+ Status = (*it)->status("/foo");
+ ASSERT_TRUE(Status.getError());
+
+ it++;
+ EXPECT_EQ(it, end);
+ }
+}
+
namespace {
struct ScopedDir {
SmallString<128> Path;
Index: llvm/include/llvm/Support/VirtualFileSystem.h
===================================================================
--- llvm/include/llvm/Support/VirtualFileSystem.h
+++ llvm/include/llvm/Support/VirtualFileSystem.h
@@ -343,15 +343,24 @@
using iterator = FileSystemList::reverse_iterator;
using const_iterator = FileSystemList::const_reverse_iterator;
+ using reverse_iterator = FileSystemList::iterator;
+ using const_reverse_iterator = FileSystemList::const_iterator;
/// Get an iterator pointing to the most recently added file system.
iterator overlays_begin() { return FSList.rbegin(); }
const_iterator overlays_begin() const { return FSList.rbegin(); }
- /// Get an iterator pointing one-past the least recently added file
- /// system.
+ /// Get an iterator pointing one-past the least recently added file system.
iterator overlays_end() { return FSList.rend(); }
const_iterator overlays_end() const { return FSList.rend(); }
+
+ /// Get an iterator pointing to the least recently added file system.
+ reverse_iterator overlays_rbegin() { return FSList.begin(); }
+ const_reverse_iterator overlays_rbegin() const { return FSList.begin(); }
+
+ /// Get an iterator pointing one-past the most recently added file system.
+ reverse_iterator overlays_rend() { return FSList.end(); }
+ const_reverse_iterator overlays_rend() const { return FSList.end(); }
};
/// By default, this delegates all calls to the underlying file system. This
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D64113.207670.patch
Type: text/x-patch
Size: 2996 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190703/f1abebe5/attachment.bin>
More information about the llvm-commits
mailing list