fix rule for const task private vars

Signed-off-by: Jade Abraham <[email protected]>
chapel-lang · Sep 27, 2024 · 0ecd373 · 0ecd373
1 parent 1de6c81
commit 0ecd373
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/test/chplcheck/UnusedTaskIntent.chpl b/test/chplcheck/UnusedTaskIntent.chpl
@@ -29,4 +29,7 @@ module UnusedTaskIntent {
   @chplcheck.ignore("UnusedTaskIntent")
   [1..10 with(ref A)] { ; }
 
+  forall 1..10 with (const A) { }
+  forall 1..10 with (const x: int) { }
+  forall 1..10 with (const x = 1) { }
 }
diff --git a/test/chplcheck/UnusedTaskIntent.good b/test/chplcheck/UnusedTaskIntent.good
@@ -9,4 +9,5 @@ UnusedTaskIntent.chpl:22: node violates rule UnusedTaskIntent
 UnusedTaskIntent.chpl:24: node violates rule UnusedTaskIntent
 UnusedTaskIntent.chpl:26: node violates rule UnusedTaskIntent
 UnusedTaskIntent.chpl:27: node violates rule UnusedTaskIntent
+UnusedTaskIntent.chpl:32: node violates rule UnusedTaskIntent
 [Success matching fixit for UnusedTaskIntent]
diff --git a/test/chplcheck/UnusedTaskIntent.good-fixit b/test/chplcheck/UnusedTaskIntent.good-fixit
@@ -29,4 +29,7 @@ module UnusedTaskIntent {
   @chplcheck.ignore("UnusedTaskIntent")
   [1..10 with(ref A)] { ; }
 
+  forall 1..10 { }
+  forall 1..10 with (const x: int) { }
+  forall 1..10 with (const x = 1) { }
 }
diff --git a/tools/chplcheck/src/rules.py b/tools/chplcheck/src/rules.py
@@ -633,9 +633,16 @@ def UnusedTaskIntent(context: Context, root: AstNode):
         for intent, _ in chapel.each_matching(
             root, set([TaskVar, ReduceIntent])
         ):
-            # var intents may have side effects, so we don't want to warn on them
-            if isinstance(intent, TaskVar) and intent.intent() == "var":
-                continue
+            # task private variables may have side effects,
+            # so we don't want to warn on them
+            if isinstance(intent, TaskVar):
+                if intent.intent() == "var":
+                    continue
+                if intent.intent() == "<const-var>" and (
+                    intent.type_expression() is not None
+                    or intent.init_expression() is not None
+                ):
+                    continue
             intents[intent.unique_id()] = intent
 
         for use, _ in chapel.each_matching(root, Identifier):