From c803e797cee1f25bdb6db39b42c3b6f53d7c9f78 Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Sun, 22 Nov 2015 03:13:02 +0000 Subject: [PATCH] [coroutines] Materialize the awaitable before generating the await_* calls. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@253812 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Sema/SemaCoroutine.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/Sema/SemaCoroutine.cpp b/lib/Sema/SemaCoroutine.cpp index a0d24b8cec..20c9c551d4 100644 --- a/lib/Sema/SemaCoroutine.cpp +++ b/lib/Sema/SemaCoroutine.cpp @@ -195,7 +195,7 @@ static ReadySuspendResumeResult buildCoawaitCalls(Sema &S, SourceLocation Loc, const StringRef Funcs[] = {"await_ready", "await_suspend", "await_resume"}; for (size_t I = 0, N = llvm::array_lengthof(Funcs); I != N; ++I) { Expr *Operand = new (S.Context) OpaqueValueExpr( - Loc, E->getType(), E->getValueKind(), E->getObjectKind(), E); + Loc, E->getType(), VK_LValue, E->getObjectKind(), E); // FIXME: Pass coroutine handle to await_suspend. ExprResult Result = buildMemberCall(S, Operand, Loc, Funcs[I], None); @@ -237,8 +237,10 @@ ExprResult Sema::BuildCoawaitExpr(SourceLocation Loc, Expr *E) { return Res; } - // FIXME: If E is a prvalue, create a temporary. - // FIXME: If E is an xvalue, convert to lvalue. + // If the expression is a temporary, materialize it as an lvalue so that we + // can use it multiple times. + if (E->getValueKind() == VK_RValue) + E = new (Context) MaterializeTemporaryExpr(E->getType(), E, true); // Build the await_ready, await_suspend, await_resume calls. ReadySuspendResumeResult RSS = buildCoawaitCalls(*this, Loc, E); @@ -306,8 +308,10 @@ ExprResult Sema::BuildCoyieldExpr(SourceLocation Loc, Expr *E) { return Res; } - // FIXME: If E is a prvalue, create a temporary. - // FIXME: If E is an xvalue, convert to lvalue. + // If the expression is a temporary, materialize it as an lvalue so that we + // can use it multiple times. + if (E->getValueKind() == VK_RValue) + E = new (Context) MaterializeTemporaryExpr(E->getType(), E, true); // Build the await_ready, await_suspend, await_resume calls. ReadySuspendResumeResult RSS = buildCoawaitCalls(*this, Loc, E); -- 2.40.0