<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Wed, Jan 29, 2014 at 8:47 AM, David Blaikie <span dir="ltr"><<a href="mailto:dblaikie@gmail.com" target="_blank">dblaikie@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote"><div class="im">On Wed, Jan 29, 2014 at 12:49 AM, Manuel Klimek <span dir="ltr"><<a href="mailto:klimek@google.com" target="_blank">klimek@google.com</a>></span> wrote:<br>

<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: klimek<br>
Date: Wed Jan 29 02:49:02 2014<br>
New Revision: 200381<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=200381&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=200381&view=rev</a><br>
Log:<br>
Fix crash on unmatched #endif's.<br>
<br>
The following snippet would crash:<br>
  #endif<br>
  #if A<br></blockquote><div><br></div></div><div>Any reason this wasn't contributed as a test case?</div></div></div></div></blockquote><div><br></div><div>Isn't this included as test case? (I marked it "**" below)</div>
<div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div class="gmail_extra"><div class="gmail_quote"><div><div class="h5"><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">

<br>
Modified:<br>
    cfe/trunk/lib/Format/UnwrappedLineParser.cpp<br>
    cfe/trunk/unittests/Format/FormatTest.cpp<br>
<br>
Modified: cfe/trunk/lib/Format/UnwrappedLineParser.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/UnwrappedLineParser.cpp?rev=200381&r1=200380&r2=200381&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/UnwrappedLineParser.cpp?rev=200381&r1=200380&r2=200381&view=diff</a><br>


==============================================================================<br>
--- cfe/trunk/lib/Format/UnwrappedLineParser.cpp (original)<br>
+++ cfe/trunk/lib/Format/UnwrappedLineParser.cpp Wed Jan 29 02:49:02 2014<br>
@@ -509,7 +509,9 @@ void UnwrappedLineParser::parsePPEndIf()<br>
       PPLevelBranchCount[PPBranchLevel] = PPChainBranchIndex.top() + 1;<br>
     }<br>
   }<br>
-  --PPBranchLevel;<br>
+  // Guard against #endif's without #if.<br>
+  if (PPBranchLevel > 0)<br>
+    --PPBranchLevel;<br>
   if (!PPChainBranchIndex.empty())<br>
     PPChainBranchIndex.pop();<br>
   if (!PPStack.empty())<br>
<br>
Modified: cfe/trunk/unittests/Format/FormatTest.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=200381&r1=200380&r2=200381&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=200381&r1=200380&r2=200381&view=diff</a><br>


==============================================================================<br>
--- cfe/trunk/unittests/Format/FormatTest.cpp (original)<br>
+++ cfe/trunk/unittests/Format/FormatTest.cpp Wed Jan 29 02:49:02 2014<br>
@@ -2427,6 +2427,11 @@ TEST_F(FormatTest, LayoutStatementsAroun<br>
                "#endif");<br>
 }<br>
<br>
+TEST_F(FormatTest, GraciouslyHandleIncorrectPreprocessorConditions) {<br>
+  verifyFormat("#endif\n"<br>
+               "#if B");<br>
+}<br></blockquote></div></div></div></div></div></blockquote><div><br></div><div>**</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div class="gmail_extra">
<div class="gmail_quote"><div><div class="h5"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+<br>
 TEST_F(FormatTest, FormatsJoinedLinesOnSubsequentRuns) {<br>
   FormatStyle SingleLine = getLLVMStyle();<br>
   SingleLine.AllowShortIfStatementsOnASingleLine = true;<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu" target="_blank">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></div></div><br></div></div>
<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>
<br></blockquote></div><br></div></div>