[llvm-branch-commits] [llvm-branch] r182438 - Merging r181366:

[Bill Wendling]

Author: void
Date: Tue May 21 18:47:17 2013
New Revision: 182438

URL: http://llvm.org/viewvc/llvm-project?rev=182438&view=rev
Log:
Merging r181366:
------------------------------------------------------------------------
r181366 | enderby | 2013-05-07 14:40:58 -0700 (Tue, 07 May 2013) | 6 lines

Fix a bug in the MC asm parser evaluating expressions.  It was treating:
A = 9
B = 3 * A - 2 * A + 1 as  B = 3 * A - (2 * A + 1)

rdar://13816516

------------------------------------------------------------------------

Modified:
    llvm/branches/release_33/   (props changed)
    llvm/branches/release_33/lib/MC/MCParser/AsmParser.cpp
    llvm/branches/release_33/test/MC/AsmParser/exprs.s

Propchange: llvm/branches/release_33/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 21 18:47:17 2013
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,181286,181296,181313,181397,181423,181450,181524,181529,181540,181576-181580,181586,181600,181678,181706,181792,181800,181842,181864,182072,182112-182113,182344,182364,182385,182387
+/llvm/trunk:155241,181286,181296,181313,181366,181397,181423,181450,181524,181529,181540,181576-181580,181586,181600,181678,181706,181792,181800,181842,181864,182072,182112-182113,182344,182364,182385,182387

Modified: llvm/branches/release_33/lib/MC/MCParser/AsmParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_33/lib/MC/MCParser/AsmParser.cpp?rev=182438&r1=182437&r2=182438&view=diff
==============================================================================
--- llvm/branches/release_33/lib/MC/MCParser/AsmParser.cpp (original)
+++ llvm/branches/release_33/lib/MC/MCParser/AsmParser.cpp Tue May 21 18:47:17 2013
@@ -1092,7 +1092,7 @@ bool AsmParser::ParseBinOpRHS(unsigned P
     MCBinaryExpr::Opcode Dummy;
     unsigned NextTokPrec = getBinOpPrecedence(Lexer.getKind(), Dummy);
     if (TokPrec < NextTokPrec) {
-      if (ParseBinOpRHS(Precedence+1, RHS, EndLoc)) return true;
+      if (ParseBinOpRHS(TokPrec+1, RHS, EndLoc)) return true;
     }
 
     // Merge LHS and RHS according to operator.

Modified: llvm/branches/release_33/test/MC/AsmParser/exprs.s
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_33/test/MC/AsmParser/exprs.s?rev=182438&r1=182437&r2=182438&view=diff
==============================================================================
--- llvm/branches/release_33/test/MC/AsmParser/exprs.s (original)
+++ llvm/branches/release_33/test/MC/AsmParser/exprs.s Tue May 21 18:47:17 2013
@@ -45,6 +45,7 @@ k:
         check_expr 0 || 0, 0
         check_expr 1 + 2 < 3 + 4, 1
         check_expr 1 << 8 - 1, 128
+        check_expr 3 * 9 - 2 * 9 + 1, 10
 
         .set c, 10
         check_expr c + 1, 11