Index: clang/lib/Analysis/CFG.cpp =================================================================== --- clang/lib/Analysis/CFG.cpp +++ clang/lib/Analysis/CFG.cpp @@ -3137,8 +3137,19 @@ return Visit(O, AddStmtChoice::AlwaysAdd, /*ExternallyDestructed=*/true); return Block; } - // co_return - return VisitChildren(S); + + CoreturnStmt *CRS = cast(S); + auto *B = Block; + if (CFGBlock *R = Visit(CRS->getPromiseCall())) + B = R; + + if (Expr *RV = CRS->getOperand()) + if (RV->getType()->isVoidType() && !isa(RV)) + // A non-initlist void expression. + if (CFGBlock *R = Visit(RV)) + B = R; + + return B; } CFGBlock *CFGBuilder::VisitSEHExceptStmt(SEHExceptStmt *ES) { Index: clang/test/SemaCXX/PR55406.cpp =================================================================== --- /dev/null +++ clang/test/SemaCXX/PR55406.cpp @@ -0,0 +1,47 @@ +// RUN: %clang_cc1 -fsyntax-only -verify -Wthread-safety -std=c++17 -fcoroutines-ts %s + +// expected-no-diagnostics + +namespace std { +template +struct coroutine_traits { + using promise_type = typename _Result::promise_type; +}; + +template +struct coroutine_handle; + +template <> +struct coroutine_handle { + static coroutine_handle from_address(void *__a) noexcept; + void resume() const noexcept; + void destroy() const noexcept; +}; + +template +struct coroutine_handle : coroutine_handle<> {}; + +struct suspend_always { + bool await_ready() const noexcept; + void await_suspend(coroutine_handle<>) const noexcept; + void await_resume() const noexcept; +}; +} // namespace std + +class Task { +public: + struct promise_type { + public: + std::suspend_always initial_suspend() noexcept; + std::suspend_always final_suspend() noexcept; + + Task get_return_object() noexcept; + void unhandled_exception() noexcept; + void return_value(int value) noexcept; + }; +}; + +Task Foo() noexcept { + // ICE'd + co_return({ int frame = 0; 0; }); +}