Merge branch 'main' into michaelrfairhurst/package-deadcode-9-rule-0-2-3

Author: mbaluda

c/common/test/rules/unusedparameter/UnusedParameter.ql

@@ -1,4 +1,8 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.unusedparameter.UnusedParameter
 
-class TestFileQuery extends UnusedParameterSharedQuery, TestQuery { }
+module UnusedParameterTestConfig implements UnusedParameterSharedConfigSig {
+  Query getQuery() { result instanceof TestQuery }
+}
+
+import UnusedParameterShared<UnusedParameterTestConfig>

c/misra/src/rules/RULE-2-7/UnusedParameter.ql

@@ -16,6 +16,8 @@ import cpp
 import codingstandards.c.misra
 import codingstandards.cpp.rules.unusedparameter.UnusedParameter
 
-class UnusedParameterQuery extends UnusedParameterSharedQuery {
-  UnusedParameterQuery() { this = DeadCodePackage::unusedParameterQuery() }
+module UnusedParameterQueryConfig implements UnusedParameterSharedConfigSig {
+  Query getQuery() { result = DeadCodePackage::unusedParameterQuery() }
 }
+
+import UnusedParameterShared<UnusedParameterQueryConfig>

change_notes/2026-02-13-refactor-unused-parameter-queries.md

@@ -0,0 +1,2 @@
+ - `A0-1-4`, `RULE-2-7` - `UnusedParameter.ql`:
+   - Refactored to be able to share most logic between MISRA C, MISRA C++, and AUTOSAR. No visible change in behavior expected.

cpp/autosar/src/rules/A0-1-4/UnusedParameter.ql

@@ -18,6 +18,13 @@ import codingstandards.cpp.autosar
 import codingstandards.cpp.deadcode.UnusedParameters
 import codingstandards.cpp.rules.unusedparameter.UnusedParameter
 
-class UnusedParameterQuery extends UnusedParameterSharedQuery {
-  UnusedParameterQuery() { this = DeadCodePackage::unusedParameterQuery() }
+module UnusedParameterQueryConfig implements UnusedParameterSharedConfigSig {
+  Query getQuery() { result = DeadCodePackage::unusedParameterQuery() }
+
+  predicate excludeParameter(Parameter p) {
+    // Virtual functions are covered by a different rule
+    p.getFunction().isVirtual()
+  }
 }
+
+import UnusedParameterShared<UnusedParameterQueryConfig>

cpp/autosar/test/rules/A0-1-4/UnusedParameter.expected

@@ -0,0 +1 @@
+| test.cpp:2:14:2:14 | x | Unused parameter 'x' for function $@. | test.cpp:2:8:2:8 | b | A::b |

cpp/autosar/test/rules/A0-1-4/UnusedParameter.qlref

@@ -0,0 +1 @@
+rules/A0-1-4/UnusedParameter.ql

cpp/autosar/test/rules/A0-1-4/UnusedParameter.testref

@@ -0,0 +1,7 @@
+class A {
+  void b(int x) {} // NON_COMPLIANT
+
+  // This is specially excluded from A0-1-4, covered by a different rule,
+  // even though it's non compliant in the shared query.
+  virtual void d(int x, int y) {} // COMPLIANT
+};

cpp/autosar/test/rules/A0-1-4/test.cpp

@@ -0,0 +1,26 @@
+//** THIS FILE IS AUTOGENERATED, DO NOT MODIFY DIRECTLY.  **/
+import cpp
+import RuleMetadata
+import codingstandards.cpp.exclusions.RuleMetadata
+
+newtype DeadCode11Query = TPotentiallyErroneousContainerUsageQuery()
+
+predicate isDeadCode11QueryMetadata(Query query, string queryId, string ruleId, string category) {
+  query =
+    // `Query` instance for the `potentiallyErroneousContainerUsage` query
+    DeadCode11Package::potentiallyErroneousContainerUsageQuery() and
+  queryId =
+    // `@id` for the `potentiallyErroneousContainerUsage` query
+    "cpp/misra/potentially-erroneous-container-usage" and
+  ruleId = "RULE-28-6-4" and
+  category = "required"
+}
+
+module DeadCode11Package {
+  Query potentiallyErroneousContainerUsageQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `potentiallyErroneousContainerUsage` query
+      TQueryCPP(TDeadCode11PackageQuery(TPotentiallyErroneousContainerUsageQuery()))
+  }
+}

cpp/common/src/codingstandards/cpp/exclusions/cpp/DeadCode11.qll

@@ -0,0 +1,26 @@
+//** THIS FILE IS AUTOGENERATED, DO NOT MODIFY DIRECTLY.  **/
+import cpp
+import RuleMetadata
+import codingstandards.cpp.exclusions.RuleMetadata
+
+newtype DeadCode8Query = TUnusedParameterMisraCppQuery()
+
+predicate isDeadCode8QueryMetadata(Query query, string queryId, string ruleId, string category) {
+  query =
+    // `Query` instance for the `unusedParameterMisraCpp` query
+    DeadCode8Package::unusedParameterMisraCppQuery() and
+  queryId =
+    // `@id` for the `unusedParameterMisraCpp` query
+    "cpp/misra/unused-parameter-misra-cpp" and
+  ruleId = "RULE-0-2-2" and
+  category = "required"
+}
+
+module DeadCode8Package {
+  Query unusedParameterMisraCppQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `unusedParameterMisraCpp` query
+      TQueryCPP(TDeadCode8PackageQuery(TUnusedParameterMisraCppQuery()))
+  }
+}