fix the ?: fixit that ted added to recover properly.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@101943 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Parse/ParseExpr.cpp b/lib/Parse/ParseExpr.cpp
index ee714e8..27696c4 100644
--- a/lib/Parse/ParseExpr.cpp
+++ b/lib/Parse/ParseExpr.cpp
@@ -335,15 +335,15 @@
Diag(Tok, diag::ext_gnu_conditional_expr);
}
- if (Tok.isNot(tok::colon)) {
+ if (Tok.is(tok::colon)) {
+ // Eat the colon.
+ ColonLoc = ConsumeToken();
+ } else {
Diag(Tok, diag::err_expected_colon)
<< FixItHint::CreateInsertion(Tok.getLocation(), ": ");
Diag(OpToken, diag::note_matching) << "?";
- return ExprError();
+ ColonLoc = Tok.getLocation();
}
-
- // Eat the colon.
- ColonLoc = ConsumeToken();
}
// Parse another leaf here for the RHS of the operator.
diff --git a/test/FixIt/fixit.c b/test/FixIt/fixit.c
index 4c506df..9f85852 100644
--- a/test/FixIt/fixit.c
+++ b/test/FixIt/fixit.c
@@ -31,8 +31,8 @@
int i0 = { 17 };
-int test_cond(int y) {
-// CHECK: int x = y ? 1 : 2;
- int x = y ? 1 2;
+int test_cond(int y, int fooBar) {
+// CHECK: int x = y ? 1 : 4+fooBar;
+ int x = y ? 1 4+foobar;
return x;
}