Commit 49066817 authored by Bill Wendling's avatar Bill Wendling
Browse files

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

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

llvm-svn: 182438
parent 8dd2f524

llvm/lib/MC/MCParser/AsmParser.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1092,7 +1092,7 @@ bool AsmParser::ParseBinOpRHS(unsigned Precedence, const MCExpr *&Res, 
    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.

llvm/test/MC/AsmParser/exprs.s

+1 −0
Original line number Diff line number Diff line
@@ -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