diff options
| author | Bill Wendling <isanbard@gmail.com> | 2013-05-21 23:47:17 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2013-05-21 23:47:17 +0000 |
| commit | 595bc150b4c13f739c9bd587290d6406f2f177b4 (patch) | |
| tree | 1a84b9958a737fa422cca5a68734fab2a92283fb /lib | |
| parent | 3d3a37ed4d2bf264bd47a672efadd2f550f485f7 (diff) | |
| download | llvm-595bc150b4c13f739c9bd587290d6406f2f177b4.tar.gz llvm-595bc150b4c13f739c9bd587290d6406f2f177b4.tar.bz2 llvm-595bc150b4c13f739c9bd587290d6406f2f177b4.tar.xz | |
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
------------------------------------------------------------------------
git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_33@182438 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/MC/MCParser/AsmParser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/MC/MCParser/AsmParser.cpp b/lib/MC/MCParser/AsmParser.cpp index 2368e9e86a..edefdb4c36 100644 --- a/lib/MC/MCParser/AsmParser.cpp +++ b/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. |