maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Make directory iterator sentinels free. 

This trades some complexity in operator== for not introducing static objects
into any functions using recursive directory iterators.

llvm-svn: 188081
This commit is contained in:
Benjamin Kramer 2013-08-09 17:03:39 +00:00
parent 6afbc442d6
commit eeeb4828bb
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
llvm/include/llvm/Support/FileSystem.h
View File

@ -869,7 +869,7 @@ public:
}
/// Construct end iterator.
directory_iterator() : State(new detail::DirIterState) {}
directory_iterator() : State(0) {}
// No operator++ because we need error_code.
directory_iterator &increment(error_code &ec) {
@ -881,6 +881,12 @@ public:
const directory_entry *operator->() const { return &State->CurrentEntry; }
bool operator==(const directory_iterator &RHS) const {
if (State == RHS.State)
return true;
if (RHS.State == 0)
return State->CurrentEntry == directory_entry();
if (State == 0)
return RHS.State->CurrentEntry == directory_entry();
return State->CurrentEntry == RHS.State->CurrentEntry;
}
@ -920,7 +926,7 @@ public:
}
// No operator++ because we need error_code.
recursive_directory_iterator &increment(error_code &ec) {
static const directory_iterator end_itr;
const directory_iterator end_itr;
if (State->HasNoPushRequest)
State->HasNoPushRequest = false;
@ -967,7 +973,7 @@ public:
assert(State && "Cannot pop and end itertor!");
assert(State->Level > 0 && "Cannot pop an iterator with level < 1");
static const directory_iterator end_itr;
const directory_iterator end_itr;
error_code ec;
do {
if (ec)