Author: ericwf Date: Mon Jul 31 00:48:13 2017 New Revision: 309545 URL: http://llvm.org/viewvc/llvm-project?rev=309545&view=rev Log: [coroutines] Evaluate the operand of void `co_return` expressions.
Summary: Previously Clang incorrectly ignored the expression of a void `co_return`. This patch addresses that bug. I'm not quite sure if I got the code-gen right, but this patch is at least a start. Reviewers: rsmith, GorNishanov Reviewed By: rsmith, GorNishanov Subscribers: cfe-commits Differential Revision: https://reviews.llvm.org/D36070 Modified: cfe/trunk/lib/CodeGen/CGCoroutine.cpp cfe/trunk/test/CodeGenCoroutines/coro-ret-void.cpp Modified: cfe/trunk/lib/CodeGen/CGCoroutine.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGCoroutine.cpp?rev=309545&r1=309544&r2=309545&view=diff ============================================================================== --- cfe/trunk/lib/CodeGen/CGCoroutine.cpp (original) +++ cfe/trunk/lib/CodeGen/CGCoroutine.cpp Mon Jul 31 00:48:13 2017 @@ -234,6 +234,13 @@ RValue CodeGenFunction::EmitCoyieldExpr( void CodeGenFunction::EmitCoreturnStmt(CoreturnStmt const &S) { ++CurCoro.Data->CoreturnCount; + const Expr *RV = S.getOperand(); + if (RV && RV->getType()->isVoidType()) { + // Make sure to evaluate the expression of a co_return with a void + // expression for side effects. + RunCleanupsScope cleanupScope(*this); + EmitIgnoredExpr(RV); + } EmitStmt(S.getPromiseCall()); EmitBranchThroughCleanup(CurCoro.Data->FinalJD); } Modified: cfe/trunk/test/CodeGenCoroutines/coro-ret-void.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCoroutines/coro-ret-void.cpp?rev=309545&r1=309544&r2=309545&view=diff ============================================================================== --- cfe/trunk/test/CodeGenCoroutines/coro-ret-void.cpp (original) +++ cfe/trunk/test/CodeGenCoroutines/coro-ret-void.cpp Mon Jul 31 00:48:13 2017 @@ -21,6 +21,20 @@ coro1 f() { // CHECK: call void @_ZNSt12experimental13coroutines_v113suspend_never12await_resumeEv(%"struct.std::experimental::coroutines_v1::suspend_never"* // CHECK: call void @_ZN5coro112promise_type11return_voidEv(%"struct.coro1::promise_type"* %__promise) +struct A { + A(); + ~A(); +}; + +coro1 f2() { + co_return (void) A{}; +} + +// CHECK-LABEL: define void @_Z2f2v( +// CHECK: call void @_ZN1AC1Ev(%struct.A* %[[AVar:.*]]) +// CHECK-NEXT: call void @_ZN1AD1Ev(%struct.A* %[[AVar]]) +// CHECK-NEXT: call void @_ZN5coro112promise_type11return_voidEv(%"struct.coro1::promise_type"* + struct coro2 { struct promise_type { coro2 get_return_object(); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
