<div dir="ltr">On Wed, May 21, 2014 at 11:18 AM, Benjamin Kramer <span dir="ltr"><<a href="mailto:benny.kra@gmail.com" target="_blank">benny.kra@gmail.com</a>></span> wrote:<br><div class="gmail_extra"><div class="gmail_quote">
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="HOEnZb"><div class="h5"><br>
On 21.05.2014, at 19:53, Saleem Abdulrasool <<a href="mailto:compnerd@compnerd.org">compnerd@compnerd.org</a>> wrote:<br>
<br>
> Author: compnerd<br>
> Date: Wed May 21 12:53:18 2014<br>
> New Revision: 209309<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=209309&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=209309&view=rev</a><br>
> Log:<br>
> MC: loosen an overzealous assertion<br>
><br>
> Permit active macro expansions when terminating the assembler if there were<br>
> errors during the expansion.  This would only trigger on invalid input when<br>
> built with assertions.<br>
><br>
> Added:<br>
>    llvm/trunk/test/MC/AsmParser/invalid-input-assertion.s<br>
> Modified:<br>
>    llvm/trunk/lib/MC/MCParser/AsmParser.cpp<br>
><br>
> Modified: llvm/trunk/lib/MC/MCParser/AsmParser.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCParser/AsmParser.cpp?rev=209309&r1=209308&r2=209309&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCParser/AsmParser.cpp?rev=209309&r1=209308&r2=209309&view=diff</a><br>

> ==============================================================================<br>
> --- llvm/trunk/lib/MC/MCParser/AsmParser.cpp (original)<br>
> +++ llvm/trunk/lib/MC/MCParser/AsmParser.cpp Wed May 21 12:53:18 2014<br>
> @@ -528,7 +528,8 @@ AsmParser::AsmParser(SourceMgr &_SM, MCC<br>
> }<br>
><br>
> AsmParser::~AsmParser() {<br>
> -  assert(ActiveMacros.empty() && "Unexpected active macro instantiation!");<br>
> +  assert((HadError || ActiveMacros.empty()) &&<br>
> +         "Unexpected active macro instantiation!");<br>
><br>
>   // Destroy any macros.<br>
>   for (StringMap<MCAsmMacro *>::iterator it = MacroMap.begin(),<br>
><br>
> Added: llvm/trunk/test/MC/AsmParser/invalid-input-assertion.s<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/AsmParser/invalid-input-assertion.s?rev=209309&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/AsmParser/invalid-input-assertion.s?rev=209309&view=auto</a><br>

> ==============================================================================<br>
> --- llvm/trunk/test/MC/AsmParser/invalid-input-assertion.s (added)<br>
> +++ llvm/trunk/test/MC/AsmParser/invalid-input-assertion.s Wed May 21 12:53:18 2014<br>
> @@ -0,0 +1,10 @@<br>
> +// RUN: not llvm-mc -triple i686-linux -o /dev/null %s<br>
> +// REQUIRES: asserts<br>
<br>
</div></div>Why does this test require assertions?<br></blockquote><div><br></div><div>The test is to ensure that the driver doesn't crash due to the assertion.  The actual handling of it wasn't changed.  I could be convinced that the test doesn't add much though.</div>
<div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
- Ben<br>
<div class="HOEnZb"><div class="h5"><br>
> +<br>
> +     .macro macro parameter=0<br>
> +             .if \parameter<br>
> +             .else<br>
> +     .endm<br>
> +<br>
> +     macro 1<br>
> +<br>
><br>
><br>
> _______________________________________________<br>
> llvm-commits mailing list<br>
> <a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
> <a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
<br>
</div></div></blockquote></div><br><br clear="all"><div><br></div>-- <br>Saleem Abdulrasool<br>compnerd (at) compnerd (dot) org
</div></div>