Disallow ref args in fork-join_any/_none blocks

MikePopoloski · Apr 6, 2024 · ddc950d · ddc950d
1 parent 0836f13
commit ddc950d
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 3 deletions.
diff --git a/bindings/python/ASTBindings.cpp b/bindings/python/ASTBindings.cpp
@@ -126,7 +126,8 @@ void registerAST(py::module_& m) {
         .value("LAndRValue", ASTFlags::LAndRValue)
         .value("NoReference", ASTFlags::NoReference)
         .value("ConfigParam", ASTFlags::ConfigParam)
-        .value("TypeOperator", ASTFlags::TypeOperator);
+        .value("TypeOperator", ASTFlags::TypeOperator)
+        .value("ForkJoinAnyNone", ASTFlags::ForkJoinAnyNone);
 
     py::class_<EvaluatedDimension>(m, "EvaluatedDimension")
         .def_readonly("kind", &EvaluatedDimension::kind)

diff --git a/include/slang/ast/ASTContext.h b/include/slang/ast/ASTContext.h
@@ -184,9 +184,12 @@ enum class SLANG_EXPORT ASTFlags : uint64_t {
     ConfigParam = 1ull << 41,
 
     /// AST binding is for the contents of the type() operator.
-    TypeOperator = 1ull << 42
+    TypeOperator = 1ull << 42,
+
+    /// AST binding is inside a fork-join_any or fork-join_none block.
+    ForkJoinAnyNone = 1ull << 43
 };
-SLANG_BITMASK(ASTFlags, TypeOperator)
+SLANG_BITMASK(ASTFlags, ForkJoinAnyNone)
 
 // clang-format off
 #define DK(x) \

diff --git a/scripts/diagnostics.txt b/scripts/diagnostics.txt
@@ -701,6 +701,7 @@ error LocalFormalVarMultiAssign "cannot bind local variable '{}' to more than on
 error InterconnectReference "cannot reference interconnect net '{}' outside of a net port connection"
 error UserDefPartialDriver "net '{}' with user-defined nettype cannot be partially driven"
 error LocalVarEventExpr "local variable '{}' cannot be referenced in an event expression"
+error RefArgForkJoin "cannot refer to 'ref' argument '{}' inside fork-join_any or fork-join_none block"
 error PatternTaggedType "expected pattern type {} is not a tagged union"
 error PatternStructType "structure pattern type {} is not a struct"
 error PatternStructTooFew "structure pattern has too few members for target type {}"

diff --git a/source/ast/Statements.cpp b/source/ast/Statements.cpp
@@ -706,6 +706,9 @@ Statement& BlockStatement::fromSyntax(Compilation& comp, const BlockStatementSyn
     if (addInitializers)
         bindScopeInitializers(context, buffer);
 
+    if (blockKind == StatementBlockKind::JoinAny || blockKind == StatementBlockKind::JoinNone)
+        context.flags |= ASTFlags::ForkJoinAnyNone;
+
     for (auto item : syntax.items) {
         if (StatementSyntax::isKind(item->kind)) {
             auto& stmt = Statement::bind(item->as<StatementSyntax>(), context, stmtCtx,

diff --git a/source/ast/expressions/MiscExpressions.cpp b/source/ast/expressions/MiscExpressions.cpp
@@ -80,6 +80,13 @@ Expression& ValueExpressionBase::fromSymbol(const ASTContext& context, const Sym
             context.addDiag(diag::LocalVarEventExpr, sourceRange) << symbol.name;
             return badExpr(comp, nullptr);
         }
+        else if (flags.has(ASTFlags::ForkJoinAnyNone) && !var.flags.has(VariableFlags::RefStatic) &&
+                 symbol.kind == SymbolKind::FormalArgument &&
+                 symbol.as<FormalArgumentSymbol>().direction == ArgumentDirection::Ref) {
+            // Can't refer to ref args in fork-join_any/none
+            context.addDiag(diag::RefArgForkJoin, sourceRange) << symbol.name;
+            return badExpr(comp, nullptr);
+        }
     }
     else if (symbol.kind == SymbolKind::ConstraintBlock) {
         if (!symbol.as<ConstraintBlockSymbol>().isStatic)

diff --git a/tests/unittests/ast/StatementTests.cpp b/tests/unittests/ast/StatementTests.cpp
@@ -1979,3 +1979,26 @@ endclass
     REQUIRE(diags.size() == 1);
     CHECK(diags[0].code == diag::UnusedResult);
 }
+
+TEST_CASE("Ref args in fork-join blocks") {
+    auto options = optionsFor(LanguageVersion::v1800_2023);
+    auto tree = SyntaxTree::fromText(R"(
+function automatic foo(ref a, ref static b);
+    fork
+        automatic int k = a;
+        begin : foo
+            $display(a);
+            $display(b);
+        end
+    join_none
+endfunction
+)",
+                                     options);
+
+    Compilation compilation(options);
+    compilation.addSyntaxTree(tree);
+
+    auto& diags = compilation.getAllDiagnostics();
+    REQUIRE(diags.size() == 1);
+    CHECK(diags[0].code == diag::RefArgForkJoin);
+}