From c6bd46b9d277cf69587a29b0938dbee0b6f1ab23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20=C5=9Euhan?= Date: Tue, 22 Oct 2019 11:12:31 -0700 Subject: [PATCH] Fix FileManager invalidation issue for file redirect --- lib/Basic/FileManager.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/Basic/FileManager.cpp b/lib/Basic/FileManager.cpp index bda861e8309..bade78a2868 100644 --- a/lib/Basic/FileManager.cpp +++ b/lib/Basic/FileManager.cpp @@ -275,7 +275,10 @@ FileManager::getFileRef(StringRef Filename, bool openFile, bool CacheFailure) { // 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; + auto SeenFileInsertResultIt = SeenFileEntries.find(Filename); + assert(SeenFileInsertResultIt != SeenFileEntries.end() && + "unexpected SeenFileEntries cache miss"); + SeenFileInsertResultIt->second = Redirect; } if (UFE.isValid()) { // Already have an entry with this inode, return it.