diff options
| -rw-r--r-- | Parse/ParseExpr.cpp | 4 | ||||
| -rw-r--r-- | test/Sema/conditional.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Parse/ParseExpr.cpp b/Parse/ParseExpr.cpp index c1a200cd71..0a1af1b1a7 100644 --- a/Parse/ParseExpr.cpp +++ b/Parse/ParseExpr.cpp @@ -364,8 +364,8 @@ Parser::ParseRHSOfBinaryExpression(ExprResult LHS, unsigned MinPrec) { NextTokPrec = getBinOpPrecedence(Tok.getKind()); // Assignment and conditional expressions are right-associative. - bool isRightAssoc = NextTokPrec == prec::Conditional || - NextTokPrec == prec::Assignment; + bool isRightAssoc = ThisPrec == prec::Conditional || + ThisPrec == prec::Assignment; // Get the precedence of the operator to the right of the RHS. If it binds // more tightly with RHS than we do, evaluate it completely first. diff --git a/test/Sema/conditional.c b/test/Sema/conditional.c new file mode 100644 index 0000000000..3af0fe57b4 --- /dev/null +++ b/test/Sema/conditional.c @@ -0,0 +1,4 @@ +// RUN: clang %s -fsyntax-only + +const char* test1 = 1 ? "i" : 1 == 1 ? "v" : "r"; + |