summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRichard Smith <richard-llvm@metafoo.co.uk>2019-08-26 17:31:06 +0000
committerRichard Smith <richard-llvm@metafoo.co.uk>2019-08-26 17:31:06 +0000
commit5d8005a07ec6516f59c429a9950fe1845669ab0c (patch)
tree4552e8f61d384aab27b2730f916c9aa9b739558d /lib
parent0cd2a94c8a0657dfb1ebe0d9d4d4322ee39ca8b0 (diff)
downloadclang-5d8005a07ec6516f59c429a9950fe1845669ab0c.tar.gz
Fix use of invalidated iterator introduced by r369680.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@369932 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r--lib/Basic/FileManager.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/Basic/FileManager.cpp b/lib/Basic/FileManager.cpp
index 7138f6677e..649e4d2239 100644
--- a/lib/Basic/FileManager.cpp
+++ b/lib/Basic/FileManager.cpp
@@ -263,15 +263,15 @@ FileManager::getFileRef(StringRef Filename, bool openFile, bool CacheFailure) {
// If the name returned by getStatValue is different than Filename, re-intern
// the name.
if (Status.getName() != Filename) {
- auto &NamedFileEnt =
+ auto &NewNamedFileEnt =
*SeenFileEntries.insert({Status.getName(), &UFE}).first;
- assert((*NamedFileEnt.second).get<FileEntry *>() == &UFE &&
+ assert((*NewNamedFileEnt.second).get<FileEntry *>() == &UFE &&
"filename from getStatValue() refers to wrong file");
- InterndFileName = NamedFileEnt.first().data();
+ InterndFileName = NewNamedFileEnt.first().data();
// In addition to re-interning the name, construct a redirecting seen file
// entry, that will point to the name the filesystem actually wants to use.
StringRef *Redirect = new (CanonicalNameStorage) StringRef(InterndFileName);
- SeenFileInsertResult.first->second = Redirect;
+ NamedFileEnt.second = Redirect;
}
if (UFE.isValid()) { // Already have an entry with this inode, return it.