lib/MC/MCParser/AsmParser.cpp - Issue 183273009: Prep for merging 3.4: Undo changes from 3.3 branch

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: lib/MC/MCParser/AsmParser.cpp

Issue 183273009: Prep for merging 3.4: Undo changes from 3.3 branch (Closed) Base URL: http://git.chromium.org/native_client/pnacl-llvm.git@master

Patch Set: Retry Created 6 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: lib/MC/MCParser/AsmParser.cpp

diff --git a/lib/MC/MCParser/AsmParser.cpp b/lib/MC/MCParser/AsmParser.cpp

index edefdb4c364358a39ac61d287fc8d719beb5a25d..2368e9e86a1edade1176b48586d1ca2692942e44 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(TokPrec+1, RHS, EndLoc)) return true;

+ if (ParseBinOpRHS(Precedence+1, RHS, EndLoc)) return true;

}

// Merge LHS and RHS according to operator.

« no previous file with comments | « lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp ('k') | lib/MC/MCStreamer.cpp » ('j') | no next file with comments »