<div dir="ltr">Thanks for the fix!</div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Mon, 26 Aug 2019 at 10:29, Richard Smith via cfe-commits <<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-style:solid;border-left-color:rgb(204,204,204);padding-left:1ex">Author: rsmith<br>
Date: Mon Aug 26 10:31:06 2019<br>
New Revision: 369932<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=369932&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=369932&view=rev</a><br>
Log:<br>
Fix use of invalidated iterator introduced by r369680.<br>
<br>
Modified:<br>
    cfe/trunk/lib/Basic/FileManager.cpp<br>
<br>
Modified: cfe/trunk/lib/Basic/FileManager.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/FileManager.cpp?rev=369932&r1=369931&r2=369932&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/FileManager.cpp?rev=369932&r1=369931&r2=369932&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Basic/FileManager.cpp (original)<br>
+++ cfe/trunk/lib/Basic/FileManager.cpp Mon Aug 26 10:31:06 2019<br>
@@ -263,15 +263,15 @@ FileManager::getFileRef(StringRef Filena<br>
   // If the name returned by getStatValue is different than Filename, re-intern<br>
   // the name.<br>
   if (Status.getName() != Filename) {<br>
-    auto &NamedFileEnt =<br>
+    auto &NewNamedFileEnt =<br>
         *SeenFileEntries.insert({Status.getName(), &UFE}).first;<br>
-    assert((*NamedFileEnt.second).get<FileEntry *>() == &UFE &&<br>
+    assert((*NewNamedFileEnt.second).get<FileEntry *>() == &UFE &&<br>
            "filename from getStatValue() refers to wrong file");<br>
-    InterndFileName = NamedFileEnt.first().data();<br>
+    InterndFileName = NewNamedFileEnt.first().data();<br>
     // In addition to re-interning the name, construct a redirecting seen file<br>
     // entry, that will point to the name the filesystem actually wants to use.<br>
     StringRef *Redirect = new (CanonicalNameStorage) StringRef(InterndFileName);<br>
-    SeenFileInsertResult.first->second = Redirect;<br>
+    NamedFileEnt.second = Redirect;<br>
   }<br>
<br>
   if (UFE.isValid()) { // Already have an entry with this inode, return it.<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a><br>
<a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</blockquote></div>