[coroutines] Fix assertion in DependentCoawaitExpr when the argument is non-dependent.

Summary:
A `co_await arg` expression has a dependent type whenever the promise type is still dependent, even if the argument to co_await is not. This is because we cannot attempt the `await_transform(<arg>)` until after we know the promise type.

This patch fixes an assertion in the constructor of `DependentCoawaitExpr` that asserted that `arg` must also be dependent.

Reviewers: rsmith, GorNishanov, aaron.ballman

Reviewed By: GorNishanov

Subscribers: mehdi_amini, cfe-commits

Differential Revision: https://reviews.llvm.org/D30772

llvm-svn: 297358
This commit is contained in:
Eric Fiselier 2017-03-09 05:01:31 +00:00
parent 7d271ae21d
commit 8d409e810a
2 changed files with 9 additions and 1 deletions

View File

@ -4236,7 +4236,9 @@ public:
/*InstantiationDependent*/ true,
Op->containsUnexpandedParameterPack()),
KeywordLoc(KeywordLoc) {
assert(Op->isTypeDependent() && Ty->isDependentType() &&
// NOTE: A co_await expression is dependent on the coroutines promise
// type and may be dependent even when the `Op` expression is not.
assert(Ty->isDependentType() &&
"wrong constructor for non-dependent co_await/co_yield expression");
SubExprs[0] = Op;
SubExprs[1] = OpCoawait;

View File

@ -151,6 +151,12 @@ void coreturn(int n) {
co_return 42;
}
template <class T>
void co_await_non_dependent_arg(T) {
co_await a;
}
template void co_await_non_dependent_arg(int);
void mixed_yield() {
co_yield 0; // expected-note {{use of 'co_yield'}}
return; // expected-error {{not allowed in coroutine}}