<div dir="ltr">We should take this fix for Clang 5.</div><div class="gmail_extra"><br><div class="gmail_quote">On 29 July 2017 at 23:31, Richard Smith via cfe-commits <span dir="ltr"><<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: rsmith<br>
Date: Sat Jul 29 23:31:29 2017<br>
New Revision: 309503<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=309503&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=309503&view=rev</a><br>
Log:<br>
PR33902: Invalidate line number cache when adding more text to existing buffer.<br>
<br>
This led to crashes as the line number cache would report a bogus line number<br>
for a line of code, and we'd try to find a nonexistent column within the line<br>
when printing diagnostics.<br>
<br>
Modified:<br>
    cfe/trunk/lib/Lex/<wbr>ScratchBuffer.cpp<br>
    cfe/trunk/test/Misc/caret-<wbr>diags-multiline.cpp<br>
<br>
Modified: cfe/trunk/lib/Lex/<wbr>ScratchBuffer.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Lex/ScratchBuffer.cpp?rev=309503&r1=309502&r2=309503&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/lib/Lex/<wbr>ScratchBuffer.cpp?rev=309503&<wbr>r1=309502&r2=309503&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/lib/Lex/<wbr>ScratchBuffer.cpp (original)<br>
+++ cfe/trunk/lib/Lex/<wbr>ScratchBuffer.cpp Sat Jul 29 23:31:29 2017<br>
@@ -35,6 +35,14 @@ SourceLocation ScratchBuffer::getToken(c<br>
                                        const char *&DestPtr) {<br>
   if (BytesUsed+Len+2 > ScratchBufSize)<br>
     AllocScratchBuffer(Len+2);<br>
+  else {<br>
+    // Clear out the source line cache if it's already been computed.<br>
+    // FIXME: Allow this to be incrementally extended.<br>
+    auto *ContentCache = const_cast<SrcMgr::<wbr>ContentCache *>(<br>
+        SourceMgr.getSLocEntry(<wbr>SourceMgr.getFileID(<wbr>BufferStartLoc))<br>
+                 .getFile().getContentCache());<br>
+    ContentCache->SourceLineCache = nullptr;<br>
+  }<br>
<br>
   // Prefix the token with a \n, so that it looks like it is the first thing on<br>
   // its own virtual line in caret diagnostics.<br>
<br>
Modified: cfe/trunk/test/Misc/caret-<wbr>diags-multiline.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Misc/caret-diags-multiline.cpp?rev=309503&r1=309502&r2=309503&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/Misc/<wbr>caret-diags-multiline.cpp?rev=<wbr>309503&r1=309502&r2=309503&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/Misc/caret-<wbr>diags-multiline.cpp (original)<br>
+++ cfe/trunk/test/Misc/caret-<wbr>diags-multiline.cpp Sat Jul 29 23:31:29 2017<br>
@@ -232,3 +232,8 @@ void multiple_ranges(int a, int b) {<br>
   b<br>
   );<br>
 }<br>
+<br>
+#define pr33902_a(b) #b<br>
+#define pr33902_c(d) _Pragma(pr33902_a(d))<br>
+#define pr33902_e(f) pr33902_c(GCC warning #f)<br>
+pr33902_e() pr33902_e()<br>
<br>
<br>
______________________________<wbr>_________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div>