Add checking of predicate in conditional constraints

MikePopoloski · Dec 15, 2024 · 10b0843 · 10b0843
1 parent e8c9895
commit 10b0843
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/source/ast/Constraints.cpp b/source/ast/Constraints.cpp
@@ -362,7 +362,7 @@ Constraint& ConditionalConstraint::fromSyntax(const ConditionalConstraintSyntax&
         return badConstraint(comp, result);
 
     ConstraintExprVisitor visitor(context, /* isSoft */ false);
-    if (!pred.visit(visitor))
+    if (!pred.visit(visitor) || !context.requireBooleanConvertible(pred))
         return badConstraint(comp, result);
 
     return *result;

diff --git a/tests/unittests/ast/WarningTests.cpp b/tests/unittests/ast/WarningTests.cpp
@@ -787,17 +787,25 @@ module m;
     initial if (i & 2) begin end
     initial if (i ^ 2) begin end
 endmodule
+
+class C;
+    int a;
+    constraint c {
+        if (a) {}
+    }
+endclass
 )");
 
     Compilation compilation;
     compilation.addSyntaxTree(tree);
 
     auto& diags = compilation.getAllDiagnostics();
-    REQUIRE(diags.size() == 4);
+    REQUIRE(diags.size() == 5);
     CHECK(diags[0].code == diag::FloatBoolConv);
     CHECK(diags[1].code == diag::IntBoolConv);
     CHECK(diags[2].code == diag::IntBoolConv);
     CHECK(diags[3].code == diag::FloatBoolConv);
+    CHECK(diags[4].code == diag::IntBoolConv);
 }
 
 TEST_CASE("Useless cast warnings") {