Author: rsmith
Date: Fri Nov 20 16:47:10 2015
New Revision: 253726
URL: http://llvm.org/viewvc/llvm-project?rev=253726&view=rev
Log:
[coroutines] Support braced-init-list as operand of co_yield expression.
Modified:
cfe/trunk/lib/Parse/ParseExprCXX.cpp
cfe/trunk/test/SemaCXX/coroutines.cpp
Modified: cfe/trunk/lib/Parse/ParseExprCXX.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseExprCXX.cpp?rev=253726&r1=253725&r2=253726&view=diff
==============================================================================
--- cfe/trunk/lib/Parse/ParseExprCXX.cpp (original)
+++ cfe/trunk/lib/Parse/ParseExprCXX.cpp Fri Nov 20 16:47:10 2015
@@ -1568,7 +1568,8 @@ ExprResult Parser::ParseCoyieldExpressio
assert(Tok.is(tok::kw_co_yield) && "Not co_yield!");
SourceLocation Loc = ConsumeToken();
- ExprResult Expr = ParseAssignmentExpression();
+ ExprResult Expr = Tok.is(tok::l_brace) ? ParseBraceInitializer()
+ : ParseAssignmentExpression();
if (!Expr.isInvalid())
Expr = Actions.ActOnCoyieldExpr(getCurScope(), Loc, Expr.get());
return Expr;
Modified: cfe/trunk/test/SemaCXX/coroutines.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/coroutines.cpp?rev=253726&r1=253725&r2=253726&view=diff
==============================================================================
--- cfe/trunk/test/SemaCXX/coroutines.cpp (original)
+++ cfe/trunk/test/SemaCXX/coroutines.cpp Fri Nov 20 16:47:10 2015
@@ -44,7 +44,7 @@ void undefined_promise() { // expected-e
co_await a;
}
-struct yielded_thing { int a, b, c; const char *p; };
+struct yielded_thing { const char *p; short a, b; };
struct promise {
awaitable yield_value(int); // expected-note {{candidate}}
@@ -53,7 +53,10 @@ struct promise {
void yield() {
co_yield 0;
- co_yield {1, 2, 3, "foo"}; // FIXME expected-error {{expected expression}}
+ co_yield {"foo", 1, 2};
+ co_yield {1e100}; // expected-error {{cannot be narrowed}} expected-note
{{explicit cast}} expected-warning {{changes value}} expected-warning {{braces
around scalar}}
+ co_yield {"foo", __LONG_LONG_MAX__}; // expected-error {{cannot be
narrowed}} expected-note {{explicit cast}} expected-warning {{changes value}}
+ co_yield {"foo"};
co_yield "foo"; // expected-error {{no matching}}
}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
