Fix an nice and subtle parser bug reported by Nico Weber.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@45149 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/Parse/ParseExpr.cpp b/Parse/ParseExpr.cpp
index c1a200c..0a1af1b 100644
--- a/Parse/ParseExpr.cpp
+++ b/Parse/ParseExpr.cpp
@@ -364,8 +364,8 @@
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 0000000..3af0fe5
--- /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";
+