Fix C++20 compilation errors (verilator#4670)

antmicro · Nov 6, 2023 · dc10118 · dc10118
1 parent 27102ea
commit dc10118
Show file tree

Hide file tree

Showing 11 changed files with 118 additions and 109 deletions.
diff --git a/include/verilated_timing.h b/include/verilated_timing.h
@@ -39,7 +39,7 @@
       using namespace experimental; // Bring std::experimental into the std namespace
   }
 #else
-# if defined __clang__ && defined __GLIBCXX__
+# if defined __clang__ && defined __GLIBCXX__ && !defined __cpp_impl_coroutine
 #  define __cpp_impl_coroutine 1  // Clang doesn't define this, but it's needed for libstdc++
 # endif
 # include <coroutine>

diff --git a/src/V3Ast.h b/src/V3Ast.h
@@ -757,11 +757,15 @@ class VDirection final {
     bool isRef() const VL_MT_SAFE { return m_e == REF; }
     bool isConstRef() const VL_MT_SAFE { return m_e == CONSTREF; }
 };
-constexpr bool operator==(const VDirection& lhs, const VDirection& rhs) {
+constexpr bool operator==(const VDirection& lhs, const VDirection& rhs) VL_MT_SAFE {
     return lhs.m_e == rhs.m_e;
 }
-constexpr bool operator==(const VDirection& lhs, VDirection::en rhs) { return lhs.m_e == rhs; }
-constexpr bool operator==(VDirection::en lhs, const VDirection& rhs) { return lhs == rhs.m_e; }
+constexpr bool operator==(const VDirection& lhs, VDirection::en rhs) VL_MT_SAFE {
+    return lhs.m_e == rhs;
+}
+constexpr bool operator==(VDirection::en lhs, const VDirection& rhs) VL_MT_SAFE {
+    return lhs == rhs.m_e;
+}
 inline std::ostream& operator<<(std::ostream& os, const VDirection& rhs) {
     return os << rhs.ascii();
 }

diff --git a/src/V3AstNodeDType.h b/src/V3AstNodeDType.h
@@ -777,13 +777,7 @@ class AstEnumDType final : public AstNodeDType {
     }
     ASTGEN_MEMBERS_AstEnumDType;
 
-    const char* broken() const override {
-        BROKEN_RTN(!((m_refDTypep && !childDTypep() && m_refDTypep->brokeExists())
-                     || (!m_refDTypep && childDTypep())));
-        BROKEN_RTN(std::any_of(m_tableMap.begin(), m_tableMap.end(),
-                               [](const auto& p) { return !p.second->brokeExists(); }));
-        return nullptr;
-    }
+    const char* broken() const override;
     void cloneRelink() override {
         if (m_refDTypep && m_refDTypep->clonep()) m_refDTypep = m_refDTypep->clonep();
     }

diff --git a/src/V3AstNodes.cpp b/src/V3AstNodes.cpp
@@ -1577,6 +1577,14 @@ void AstEnumItemRef::dump(std::ostream& str) const {
         str << "UNLINKED";
     }
 }
+const char* AstEnumDType::broken() const {
+    BROKEN_RTN(!((m_refDTypep && !childDTypep() && m_refDTypep->brokeExists())
+                 || (!m_refDTypep && childDTypep())));
+    BROKEN_RTN(std::any_of(m_tableMap.begin(), m_tableMap.end(),
+                           [](const auto& p) { return !p.second->brokeExists(); }));
+    return nullptr;
+}
+
 const char* AstEnumItemRef::broken() const {
     BROKEN_RTN(m_itemp && !m_itemp->brokeExists());
     BROKEN_RTN(m_classOrPackagep && !m_classOrPackagep->brokeExists());

diff --git a/src/V3Const.cpp b/src/V3Const.cpp
@@ -1126,7 +1126,7 @@ class ConstVisitor final : public VNVisitor {
         // commonly appears after V3Expand and the simplification in matchMaskedOr. Similarly,
         // drop redundant masking of left shift result. E.g.: 0xff000000 & ((uint32_t)a << 24).
 
-        const auto checkMask = [=](const V3Number& mask) -> bool {
+        const auto checkMask = [nodep, this](const V3Number& mask) -> bool {
             const AstConst* const constp = VN_AS(nodep->lhsp(), Const);
             if (constp->num().isCaseEq(mask)) {
                 AstNode* const rhsp = nodep->rhsp();

diff --git a/src/V3Dfg.h b/src/V3Dfg.h
@@ -752,13 +752,13 @@ class DfgVertexWithArity VL_NOT_FINAL : public DfgVertex {
     std::array<DfgEdge, Arity> m_srcs;  // Source edges
 
 protected:
-    DfgVertexWithArity<Arity>(DfgGraph& dfg, VDfgType type, FileLine* flp, AstNodeDType* dtypep)
+    DfgVertexWithArity(DfgGraph& dfg, VDfgType type, FileLine* flp, AstNodeDType* dtypep)
         : DfgVertex{dfg, type, flp, dtypep} {
         // Initialize source edges
         for (size_t i = 0; i < Arity; ++i) m_srcs[i].init(this);
     }
 
-    ~DfgVertexWithArity<Arity>() override = default;
+    ~DfgVertexWithArity() override = default;
 
 public:
     std::pair<DfgEdge*, size_t> sourceEdges() final override {  //

diff --git a/src/V3DfgDecomposition.cpp b/src/V3DfgDecomposition.cpp
@@ -292,11 +292,11 @@ class ExtractCyclicComponents final {
 
         // Visit all neighbors. We stop at variable boundaries,
         // which is where we will split the graphs
-        vtx.forEachSource([=](DfgVertex& other) {
+        vtx.forEachSource([this, targetComponent](DfgVertex& other) {
             if (other.is<DfgVertexVar>()) return;
             visitMergeSCCs(other, targetComponent);
         });
-        vtx.forEachSink([=](DfgVertex& other) {
+        vtx.forEachSink([this, targetComponent](DfgVertex& other) {
             if (other.is<DfgVertexVar>()) return;
             visitMergeSCCs(other, targetComponent);
         });

diff --git a/src/V3DfgVertices.h b/src/V3DfgVertices.h
@@ -224,7 +224,7 @@ class DfgVarArray final : public DfgVertexVar {
     uint32_t driverIndex(size_t idx) const { return m_driverData[idx].second; }
 
     DfgVertex* driverAt(size_t idx) const {
-        const DfgEdge* const edgep = findSourceEdge([=](const DfgEdge&, size_t i) {  //
+        const DfgEdge* const edgep = findSourceEdge([this, idx](const DfgEdge&, size_t i) {  //
             return driverIndex(i) == idx;
         });
         return edgep ? edgep->sourcep() : nullptr;