Always put co_return at end of coroutine

Signed-off-by: Krzysztof Bieganski <[email protected]>

Author: kbieganski

src/V3EmitCFunc.h

@@ -475,6 +475,12 @@ class EmitCFunc VL_NOT_FINAL : public EmitCConstInit {
 
         m_usevlSelfRef = false;
 
+        if (nodep->isCoroutine()) {
+            // Sometimes coroutines don't have co_awaits,
+            // so emit a co_return at the end to avoid compile errors.
+            puts("co_return;");
+        }
+
         puts("}\n");
         if (nodep->ifdef() != "") puts("#endif  // " + nodep->ifdef() + "\n");
     }

src/V3SchedTiming.cpp

@@ -316,7 +316,6 @@ class TransformForksVisitor final : public VNVisitor {
     // STATE
     bool m_inClass = false;  // Are we in a class?
     bool m_beginHasAwaits = false;  // Does the current begin have awaits?
-    bool m_awaitMoved = false;  // Has the current function lost awaits?
     AstFork* m_forkp = nullptr;  // Current fork
     AstCFunc* m_funcp = nullptr;  // Current function
 
@@ -373,14 +372,7 @@ class TransformForksVisitor final : public VNVisitor {
     void visit(AstCFunc* nodep) override {
         VL_RESTORER(m_funcp);
         m_funcp = nodep;
-        m_awaitMoved = false;
         iterateChildren(nodep);
-        // cppcheck-suppress knownConditionTrueFalse
-        if (nodep->isCoroutine() && m_awaitMoved
-            && !nodep->stmtsp()->exists([](AstCAwait*) { return true; })) {
-            // co_return at the end (either that or a co_await is required in a coroutine
-            nodep->addStmtsp(new AstCStmt{nodep->fileline(), "co_return;"});
-        }
     }
     void visit(AstVar* nodep) override {
         if (!m_forkp) nodep->user1(true);
@@ -459,12 +451,6 @@ class TransformForksVisitor final : public VNVisitor {
             newfuncp->setNeedProcess();
             newfuncp->addStmtsp(new AstCStmt{flp, "vlProcess->state(VlProcess::FINISHED);"});
         }
-        if (!m_beginHasAwaits) {
-            // co_return at the end (either that or a co_await is required in a coroutine
-            newfuncp->addStmtsp(new AstCStmt{flp, "co_return;"});
-        } else {
-            m_awaitMoved = true;
-        }
         remapLocals(newfuncp, callp);
     }
     void visit(AstCAwait* nodep) override {

src/V3Timing.cpp

@@ -859,21 +859,14 @@ class TimingControlVisitor final : public VNVisitor {
                 nodep->addStmtsp(cstmtp);
             }
         }
-        AstNode* firstCoStmtp = nullptr;  // First co_* statement in the function
-        nodep->exists([&](AstCAwait* const awaitp) -> bool { return (firstCoStmtp = awaitp); });
-        if (!firstCoStmtp) {
-            // It's a coroutine but has no awaits (a class method that overrides/is
-            // overridden by a suspendable, but doesn't have any awaits itself). Add a
-            // co_return at the end (either that or a co_await is required in a
-            // coroutine)
-            firstCoStmtp = new AstCStmt{nodep->fileline(), "co_return;"};
-            nodep->addStmtsp(firstCoStmtp);
-        }
         if (nodep->dpiExportImpl()) {
-            // A DPI-exported coroutine won't be able to block the calling code
-            // Error on the await node; fall back to the function node
-            firstCoStmtp->v3warn(E_UNSUPPORTED,
-                                 "Unsupported: Timing controls inside DPI-exported tasks");
+            nodep->exists([](AstCAwait* const awaitp) -> bool {
+                // A DPI-exported coroutine won't be able to block the calling code
+                // Error on the await node; fall back to the function node
+                awaitp->v3warn(E_UNSUPPORTED,
+                               "Unsupported: Timing controls inside DPI-exported tasks");
+                return true;
+            });
         }
     }
     void visit(AstNodeCCall* nodep) override {