diff options
| author | Kevin Enderby <enderby@apple.com> | 2013-05-07 21:40:58 +0000 |
|---|---|---|
| committer | Kevin Enderby <enderby@apple.com> | 2013-05-07 21:40:58 +0000 |
| commit | ca08df756e7f9f9dced63ee751fc2557974cff47 (patch) | |
| tree | c9653f1ad8a339f2be74cc245de44549777bc57c | |
| parent | 091872c5df50fc734be3074536a6184748225f40 (diff) | |
| download | bcm5719-llvm-ca08df756e7f9f9dced63ee751fc2557974cff47.tar.gz bcm5719-llvm-ca08df756e7f9f9dced63ee751fc2557974cff47.zip | |
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: 181366
| -rw-r--r-- | llvm/lib/MC/MCParser/AsmParser.cpp | 2 | ||||
| -rw-r--r-- | llvm/test/MC/AsmParser/exprs.s | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/llvm/lib/MC/MCParser/AsmParser.cpp b/llvm/lib/MC/MCParser/AsmParser.cpp index 2368e9e86a1..edefdb4c364 100644 --- a/llvm/lib/MC/MCParser/AsmParser.cpp +++ b/llvm/lib/MC/MCParser/AsmParser.cpp @@ -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. diff --git a/llvm/test/MC/AsmParser/exprs.s b/llvm/test/MC/AsmParser/exprs.s index df075f85ecf..a7e10020b67 100644 --- a/llvm/test/MC/AsmParser/exprs.s +++ b/llvm/test/MC/AsmParser/exprs.s @@ -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 |
