From 98f9e94e57d62170ee5c7dcd4e4d90ddb84baf2d Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Mon, 26 Aug 2019 17:31:06 +0000 Subject: Fix use of invalidated iterator introduced by r369680. llvm-svn: 369932 --- clang/lib/Basic/FileManager.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'clang/lib/Basic/FileManager.cpp') diff --git a/clang/lib/Basic/FileManager.cpp b/clang/lib/Basic/FileManager.cpp index 7138f6677e3..649e4d2239b 100644 --- a/clang/lib/Basic/FileManager.cpp +++ b/clang/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() == &UFE && + assert((*NewNamedFileEnt.second).get() == &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. -- cgit v1.2.3