aboutsummaryrefslogtreecommitdiff
path: root/lib/Parse/ParseExpr.cpp
diff options
context:
space:
mode:
authorSebastian Redl <sebastian.redl@getdesigned.at>2011-12-22 18:58:29 +0000
committerSebastian Redl <sebastian.redl@getdesigned.at>2011-12-22 18:58:29 +0000
commit62f13c9e9e87b14c1d387891575ccf5dfac7b673 (patch)
tree268dd5af0a7a0c81abd0b9f5ef051a6f573d6d2e /lib/Parse/ParseExpr.cpp
parent10f04a6267eb07d3be00db1fd0369e1398f5d0a8 (diff)
Fix a parser bug that prevented it from correctly parsing explicit construct expressoins of the form T{args}.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@147155 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Parse/ParseExpr.cpp')
-rw-r--r--lib/Parse/ParseExpr.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/Parse/ParseExpr.cpp b/lib/Parse/ParseExpr.cpp
index 3619017a80..8af7204cd1 100644
--- a/lib/Parse/ParseExpr.cpp
+++ b/lib/Parse/ParseExpr.cpp
@@ -678,7 +678,8 @@ ExprResult Parser::ParseCastExpression(bool isUnaryExpression,
if (Next.is(tok::coloncolon) ||
(!ColonIsSacred && Next.is(tok::colon)) ||
Next.is(tok::less) ||
- Next.is(tok::l_paren)) {
+ Next.is(tok::l_paren) ||
+ Next.is(tok::l_brace)) {
// If TryAnnotateTypeOrScopeToken annotates the token, tail recurse.
if (TryAnnotateTypeOrScopeToken())
return ExprError();