<html><head><meta http-equiv="Content-Type" content="text/html charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;">Nasty bug! Thanks, Kevin.<div><br></div><div>Bill, this makes sense for 3.3. Approved.</div><div><br></div><div>-Jim</div><div><br><div><div>On May 7, 2013, at 2:40 PM, Kevin Enderby <<a href="mailto:enderby@apple.com">enderby@apple.com</a>> wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite"><div style="letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;">Author: enderby<br>Date: Tue May 7 16:40:58 2013<br>New Revision: 181366<br><br>URL:<span class="Apple-converted-space"> </span><a href="http://llvm.org/viewvc/llvm-project?rev=181366&view=rev">http://llvm.org/viewvc/llvm-project?rev=181366&view=rev</a><br>Log:<br>Fix a bug in the MC asm parser evaluating expressions. It was treating:<br>A = 9<br>B = 3 * A - 2 * A + 1 as B = 3 * A - (2 * A + 1)<br><br><a href="rdar://13816516">rdar://13816516</a><br><br>Modified:<br> llvm/trunk/lib/MC/MCParser/AsmParser.cpp<br> llvm/trunk/test/MC/AsmParser/exprs.s<br><br>Modified: llvm/trunk/lib/MC/MCParser/AsmParser.cpp<br>URL:<span class="Apple-converted-space"> </span><a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCParser/AsmParser.cpp?rev=181366&r1=181365&r2=181366&view=diff">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCParser/AsmParser.cpp?rev=181366&r1=181365&r2=181366&view=diff</a><br>==============================================================================<br>--- llvm/trunk/lib/MC/MCParser/AsmParser.cpp (original)<br>+++ llvm/trunk/lib/MC/MCParser/AsmParser.cpp Tue May 7 16:40:58 2013<br>@@ -1092,7 +1092,7 @@ bool AsmParser::ParseBinOpRHS(unsigned P<br> MCBinaryExpr::Opcode Dummy;<br> unsigned NextTokPrec = getBinOpPrecedence(Lexer.getKind(), Dummy);<br> if (TokPrec < NextTokPrec) {<br>- if (ParseBinOpRHS(Precedence+1, RHS, EndLoc)) return true;<br>+ if (ParseBinOpRHS(TokPrec+1, RHS, EndLoc)) return true;<br> }<br><br> // Merge LHS and RHS according to operator.<br><br>Modified: llvm/trunk/test/MC/AsmParser/exprs.s<br>URL:<span class="Apple-converted-space"> </span><a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/AsmParser/exprs.s?rev=181366&r1=181365&r2=181366&view=diff">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/AsmParser/exprs.s?rev=181366&r1=181365&r2=181366&view=diff</a><br>==============================================================================<br>--- llvm/trunk/test/MC/AsmParser/exprs.s (original)<br>+++ llvm/trunk/test/MC/AsmParser/exprs.s Tue May 7 16:40:58 2013<br>@@ -45,6 +45,7 @@ k:<br> check_expr 0 || 0, 0<br> check_expr 1 + 2 < 3 + 4, 1<br> check_expr 1 << 8 - 1, 128<br>+ check_expr 3 * 9 - 2 * 9 + 1, 10<br><br> .set c, 10<br> check_expr c + 1, 11<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">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a></div></blockquote></div><br></div></body></html>