On Mon, Jul 22, 2013 at 4:09 PM, Eli Friedman <span dir="ltr"><<a href="mailto:eli.friedman@gmail.com" target="_blank">eli.friedman@gmail.com</a>></span> wrote:<br><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Author: efriedma<br>
Date: Mon Jul 22 18:09:39 2013<br>
New Revision: 186889<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=186889&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=186889&view=rev</a><br>
Log:<br>
Don't emit open-paren fixit without close-paren.<br>
<br>
getLocForEndOfToken() isn't guaranteed to succeed; if it doesn't, make sure<br>
we do something sane.<br>
<br>
Fixes PR16673.  I'm not sure how to write a testcase for this short of grepping<br>
through the diagnostic output.<br></blockquote><div><br></div><div>You can use -fdiagnostics-parseable-fixits with FileCheck to test fixits on notes.</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">

Modified:<br>
    cfe/trunk/lib/Sema/SemaExpr.cpp<br>
<br>
Modified: cfe/trunk/lib/Sema/SemaExpr.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExpr.cpp?rev=186889&r1=186888&r2=186889&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExpr.cpp?rev=186889&r1=186888&r2=186889&view=diff</a><br>

==============================================================================<br>
--- cfe/trunk/lib/Sema/SemaExpr.cpp (original)<br>
+++ cfe/trunk/lib/Sema/SemaExpr.cpp Mon Jul 22 18:09:39 2013<br>
@@ -7392,6 +7392,8 @@ static void diagnoseLogicalNotOnLHSofCom<br>
   SourceLocation FirstOpen = SubExpr->getLocStart();<br>
   SourceLocation FirstClose = RHS.get()->getLocEnd();<br>
   FirstClose = S.getPreprocessor().getLocForEndOfToken(FirstClose);<br>
+  if (FirstClose.isInvalid())<br>
+    FirstOpen = SourceLocation();<br>
   S.Diag(UO->getOperatorLoc(), diag::note_logical_not_fix)<br>
       << FixItHint::CreateInsertion(FirstOpen, "(")<br>
       << FixItHint::CreateInsertion(FirstClose, ")");<br>
@@ -7400,6 +7402,8 @@ static void diagnoseLogicalNotOnLHSofCom<br>
   SourceLocation SecondOpen = LHS.get()->getLocStart();<br>
   SourceLocation SecondClose = LHS.get()->getLocEnd();<br>
   SecondClose = S.getPreprocessor().getLocForEndOfToken(SecondClose);<br>
+  if (SecondClose.isInvalid())<br>
+    SecondOpen = SourceLocation();<br>
   S.Diag(UO->getOperatorLoc(), diag::note_logical_not_silence_with_parens)<br>
       << FixItHint::CreateInsertion(SecondOpen, "(")<br>
       << FixItHint::CreateInsertion(SecondClose, ")");<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br>