Merge branch 'main' into jeongsoolee09/MISRA-C++-Memory4

jeongsoolee09 · web-flow · commit 890f0aed78e7 · 2026-02-09T14:45:23.000-05:00
diff --git a/.github/workflows/codeql_unit_tests.yml b/.github/workflows/codeql_unit_tests.yml
@@ -50,7 +50,7 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Install Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: "3.9"
 
@@ -168,7 +168,7 @@ jobs:
     steps:
       - name: Check if run-test-suites job failed to complete, if so fail
         if: ${{ needs.run-test-suites.result == 'failure' }}
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             core.setFailed('Test run job failed')
diff --git a/.github/workflows/dispatch-matrix-test-on-comment.yml b/.github/workflows/dispatch-matrix-test-on-comment.yml
@@ -44,7 +44,7 @@ jobs:
           --json \
             -R github/codeql-coding-standards-release-engineering
 
-      - uses: actions/github-script@v7
+      - uses: actions/github-script@v8
         if: ${{ github.event.issue.pull_request && contains(github.event.comment.body, '/test-matrix') && steps.check-write-permission.outputs.has-permission }}
         with:
           script: |
diff --git a/.github/workflows/dispatch-release-performance-check.yml b/.github/workflows/dispatch-release-performance-check.yml
@@ -44,7 +44,7 @@ jobs:
           --json \
           -R github/codeql-coding-standards-release-engineering
 
-      - uses: actions/github-script@v7
+      - uses: actions/github-script@v8
         if: ${{ github.event.issue.pull_request && contains(github.event.comment.body, '/test-performance') && steps.check-write-permission.outputs.has-permission }}
         with:
           script: |
diff --git a/.github/workflows/finalize-release.yml b/.github/workflows/finalize-release.yml
@@ -57,7 +57,7 @@ jobs:
           path: tooling 
       
       - name: Install Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: "3.9"
 
diff --git a/.github/workflows/generate-html-docs.yml b/.github/workflows/generate-html-docs.yml
@@ -25,7 +25,7 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Install Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: "3.9"
 
diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
@@ -39,7 +39,7 @@ jobs:
           ref: ${{ inputs.ref }}
 
       - name: Install Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: "3.9"
 
diff --git a/.github/workflows/standard_library_upgrade_tests.yml b/.github/workflows/standard_library_upgrade_tests.yml
@@ -46,7 +46,7 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Setup Python 3
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: "3.x"
 
@@ -159,7 +159,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Install Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: "3.9"
 
diff --git a/.github/workflows/tooling-unit-tests.yml b/.github/workflows/tooling-unit-tests.yml
@@ -45,7 +45,7 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Install Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: "3.9"
 
@@ -88,7 +88,7 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Install Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: "3.9"
 
@@ -107,7 +107,7 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Install Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: "3.9"
 
diff --git a/.github/workflows/upgrade_codeql_dependencies.yml b/.github/workflows/upgrade_codeql_dependencies.yml
@@ -34,7 +34,7 @@ jobs:
           echo "$RUNNER_TEMP/codeql/" >> $GITHUB_PATH
 
       - name: Install Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: "3.9"
 
diff --git a/.github/workflows/validate-package-files.yml b/.github/workflows/validate-package-files.yml
@@ -23,7 +23,7 @@ jobs:
           ref: ${{ inputs.ref }}
 
       - name: Install Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: "3.9"
 
diff --git a/.github/workflows/verify-standard-library-dependencies.yml b/.github/workflows/verify-standard-library-dependencies.yml
@@ -49,7 +49,7 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Setup Python 3
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: "3.9"
 
diff --git a/change_notes/2025-12-17-unfeasible-statement-refactor.md b/change_notes/2025-12-17-unfeasible-statement-refactor.md
@@ -0,0 +1,2 @@
+- `M0-1-2` - `InfeasiblePath.ql`:
+  - Refactored to share logic with `RULE-0-0-2` while allowing for different exceptional cases. No change in behavior expected.
diff --git a/change_notes/2026-01-26-improve-queries.md b/change_notes/2026-01-26-improve-queries.md
@@ -1,4 +1,4 @@
 - `A3-1-1` - `ViolationsOfOneDefinitionRule.ql`:
   - The query previously would incorrectly allow cases where something was defined with `extern` and did not use the defined external linkage library to find external linkage. This change may result in the query finding more results. Additionally a typo has been fixed in the alert message which will cause the old alerts for this query to now show up as new ones.
-  - `RULE-6-0-2`, `A3-1-4` - `ExternalLinkageArrayWithoutExplicitSizeMisra.ql`, `ExternalLinkageArrayWithoutExplicitSizeAutosar.ql`:
+- `RULE-6-0-2`, `A3-1-4` - `ExternalLinkageArrayWithoutExplicitSizeMisra.ql`, `ExternalLinkageArrayWithoutExplicitSizeAutosar.ql`:
   - The queries listed now find flexible member arrays in structs, as those do not have an explicit size.
diff --git a/cpp/autosar/src/rules/M0-1-2/InfeasiblePath.ql b/cpp/autosar/src/rules/M0-1-2/InfeasiblePath.ql
@@ -16,22 +16,7 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import semmle.code.cpp.rangeanalysis.SimpleRangeAnalysis
-import codingstandards.cpp.deadcode.UnreachableCode
-import semmle.code.cpp.controlflow.Guards
-
-/**
- * A "conditional" node in the control flow graph, i.e. one that can potentially have a true and false path.
- */
-class ConditionalControlFlowNode extends ControlFlowNode {
-  ConditionalControlFlowNode() {
-    // A conditional node is one with at least one of a true or false successor
-    (exists(getATrueSuccessor()) or exists(getAFalseSuccessor())) and
-    // Ignore conditions affected by macros, as they may include deliberate infeasible paths, or
-    // paths which are only feasible in certain macro expansions
-    not isAffectedByMacro()
-  }
-}
+import codingstandards.cpp.rules.invariantcondition.InvariantCondition
 
 /**
  * A `Loop` that contains a `break` statement.
@@ -40,132 +25,21 @@ class BreakingLoop extends Loop {
   BreakingLoop() { exists(BreakStmt break | this = break.getBreakable()) }
 }
 
-/**
- * Holds if the `ConditionalNode` has an infeasible `path` according to the control flow graph library.
- */
-predicate hasCFGDeducedInfeasiblePath(
-  ConditionalControlFlowNode cond, boolean infeasiblePath, string explanation
-) {
-  not cond.isFromTemplateInstantiation(_) and
-  // No true successor, so the true path has already been deduced as infeasible
-  not exists(cond.getATrueSuccessor()) and
-  infeasiblePath = true and
-  explanation = "this expression consists of constants which evaluate to false"
-  or
-  // No false successor, so false path has already been deduced as infeasible
-  not exists(cond.getAFalseSuccessor()) and
-  not cond.getEnclosingStmt() instanceof BreakingLoop and
-  infeasiblePath = false and
-  explanation = "this expression consists of constants which evaluate to true"
-}
-
-predicate isConstantRelationalOperation(
-  RelationalOperation rel, boolean infeasiblePath, string explanation
-) {
-  /*
-   * This predicate identifies a number of a cases where we can conclusive determine that a relational
-   * operation will always return true or false, based on the ranges for each operand as determined
-   * by the SimpleRangeAnalysis library (and any extensions provide in the Coding Standards library).
-   *
-   * Important note: in order to deduce that an relational operation _always_ returns true or false,
-   * we must ensure that it returns true or false for _all_ possible values of the operands. For
-   * example, it may be tempting to look at this relational operation on these ranges:
-   * ```
-   *   [0..5] < [0..10]
-   * ```
-   * And say that ub(lesser) < ub(greater) and therefore it is `true`, however this is not the case
-   * for all permutations (e.g. 5 < 0).
-   *
-   * Instead, we look at all four permutations of these two dimensions:
-   *  - Equal-to or not equal-to
-   *  - Always true or always false
-   */
+module AutosarConfig implements InvariantConditionConfigSig {
+  Query getQuery() { result = DeadCodePackage::infeasiblePathQuery() }
 
-  // This restricts the comparison to occur directly within the conditional node
-  // In theory we could also extend this to identify comparisons where the result is stored, then
-  // later read in a conditional control flow node within the same function (using SSA)
-  // Doing so would benefit from path explanations, but would require a more complex analysis
-  rel instanceof ConditionalControlFlowNode and
-  // If at least one operand includes an access of a volatile variable, the range analysis library may
-  // provide inaccurate results, so we ignore this case
-  not rel.getAnOperand().getAChild*().(VariableAccess).getTarget().isVolatile() and
-  exists(boolean isEqual |
-    if
-      rel instanceof GEExpr
-      or
-      rel instanceof LEExpr
-    then isEqual = true
-    else isEqual = false
-  |
-    // Not equal-to/always true
-    // If the largest value of the lesser operand is less than the smallest value of the greater
-    // operand, then the LT/GT comparison is always true
-    // Example: [0..5] < [6..10]
-    upperBound(rel.getLesserOperand()) < lowerBound(rel.getGreaterOperand()) and
-    explanation =
-      rel.getLesserOperand() + " (max value: " + upperBound(rel.getLesserOperand()) +
-        ") is always less than " + rel.getGreaterOperand() + " (minimum value: " +
-        lowerBound(rel.getGreaterOperand()) + ")" and
-    isEqual = false and
-    infeasiblePath = false
-    or
-    // Equal-to/always true
-    // If the largest value of the lesser operand is less than or equal to the smallest value of the
-    // greater operand, then the LTE/GTE comparison is always true
-    // Example: [0..6] <= [6..10]
-    upperBound(rel.getLesserOperand()) <= lowerBound(rel.getGreaterOperand()) and
-    explanation =
-      rel.getLesserOperand() + " (max value: " + upperBound(rel.getLesserOperand()) +
-        ") is always less than or equal to " + rel.getGreaterOperand() + " (minimum value: " +
-        lowerBound(rel.getGreaterOperand()) + ")" and
-    isEqual = true and
-    infeasiblePath = false
-    or
-    // Equal to/always false
-    // If the largest value of the greater operand is less than the smallest value of the lesser
-    // operand, then the LTE/GTE comparison is always false
-    // Example: [6..10] <= [0..5]
-    upperBound(rel.getGreaterOperand()) < lowerBound(rel.getLesserOperand()) and
-    explanation =
-      rel.getGreaterOperand() + " (max value: " + upperBound(rel.getGreaterOperand()) +
-        ") is always less than " + rel.getLesserOperand() + " (minimum value: " +
-        lowerBound(rel.getLesserOperand()) + ")" and
-    isEqual = true and
-    infeasiblePath = true
+  predicate isException(ControlFlowNode node) {
+    node.getEnclosingElement() instanceof BreakingLoop and
+    exists(node.getATrueSuccessor())
     or
-    // Equal to/always true
-    // If the largest value of the greater operand is less than or equal to the smallest value of the
-    // lesser operand, then the LT/GT comparison is always false
-    // Example: [6..10] < [0..6]
-    upperBound(rel.getGreaterOperand()) <= lowerBound(rel.getLesserOperand()) and
-    explanation =
-      rel.getGreaterOperand() + " (max value: " + upperBound(rel.getGreaterOperand()) +
-        ") is always less than or equal to " + rel.getLesserOperand() + " (minimum value: " +
-        lowerBound(rel.getLesserOperand()) + ")" and
-    isEqual = false and
-    infeasiblePath = true
-  )
-}
-
-/**
- * Holds if the `ConditionalNode` has an infeasible `path` for the reason given in `explanation`.
- */
-predicate hasInfeasiblePath(ConditionalControlFlowNode node, string message) {
-  exists(boolean infeasiblePath, string explanation |
-    not node.isFromTemplateInstantiation(_) and
-    if node.isFromUninstantiatedTemplate(_)
-    then message = "The path is unreachable in a template."
-    else message = "The " + infeasiblePath + " path is infeasible because " + explanation + "."
-  |
-    hasCFGDeducedInfeasiblePath(node, infeasiblePath, explanation) and
-    not isConstantRelationalOperation(node, infeasiblePath, _)
+    // Ignore conditions affected by macros, as they may include deliberate infeasible paths, or
+    // paths which are only feasible in certain macro expansions
+    node.isAffectedByMacro()
     or
-    isConstantRelationalOperation(node, infeasiblePath, explanation)
-  )
+    // Only consider reachability in uninstantiated templates, to avoid false positives
+    node.isFromTemplateInstantiation(_)
+  }
 }
 
-from ConditionalControlFlowNode cond, string explanation
-where
-  not isExcluded(cond, DeadCodePackage::infeasiblePathQuery()) and
-  hasInfeasiblePath(cond, explanation)
-select cond, explanation
+// Import the problems query predicate
+import InvariantCondition<AutosarConfig>
diff --git a/cpp/common/src/codingstandards/cpp/Literals.qll b/cpp/common/src/codingstandards/cpp/Literals.qll
@@ -69,6 +69,10 @@ class BoolLiteral extends Literal {
     or
     this.getValue() = "0" and this.getValueText() = "false"
   }
+
+  predicate isTrue() { this.getValue() = "1" }
+
+  predicate isFalse() { this.getValue() = "0" }
 }
 
 /**
diff --git a/cpp/common/src/codingstandards/cpp/exclusions/cpp/DeadCode4.qll b/cpp/common/src/codingstandards/cpp/exclusions/cpp/DeadCode4.qll
@@ -0,0 +1,26 @@
+//** THIS FILE IS AUTOGENERATED, DO NOT MODIFY DIRECTLY.  **/
+import cpp
+import RuleMetadata
+import codingstandards.cpp.exclusions.RuleMetadata
+
+newtype DeadCode4Query = TInvariantConditionQuery()
+
+predicate isDeadCode4QueryMetadata(Query query, string queryId, string ruleId, string category) {
+  query =
+    // `Query` instance for the `invariantCondition` query
+    DeadCode4Package::invariantConditionQuery() and
+  queryId =
+    // `@id` for the `invariantCondition` query
+    "cpp/misra/invariant-condition" and
+  ruleId = "RULE-0-0-2" and
+  category = "advisory"
+}
+
+module DeadCode4Package {
+  Query invariantConditionQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `invariantCondition` query
+      TQueryCPP(TDeadCode4PackageQuery(TInvariantConditionQuery()))
+  }
+}
diff --git a/cpp/common/src/codingstandards/cpp/exclusions/cpp/RuleMetadata.qll b/cpp/common/src/codingstandards/cpp/exclusions/cpp/RuleMetadata.qll
@@ -18,6 +18,7 @@ import Conversions
 import Conversions2
 import DeadCode
 import DeadCode3
+import DeadCode4
 import Declarations
 import ExceptionSafety
 import Exceptions1
@@ -89,6 +90,7 @@ newtype TCPPQuery =
   TConversions2PackageQuery(Conversions2Query q) or
   TDeadCodePackageQuery(DeadCodeQuery q) or
   TDeadCode3PackageQuery(DeadCode3Query q) or
+  TDeadCode4PackageQuery(DeadCode4Query q) or
   TDeclarationsPackageQuery(DeclarationsQuery q) or
   TExceptionSafetyPackageQuery(ExceptionSafetyQuery q) or
   TExceptions1PackageQuery(Exceptions1Query q) or
@@ -160,6 +162,7 @@ predicate isQueryMetadata(Query query, string queryId, string ruleId, string cat
   isConversions2QueryMetadata(query, queryId, ruleId, category) or
   isDeadCodeQueryMetadata(query, queryId, ruleId, category) or
   isDeadCode3QueryMetadata(query, queryId, ruleId, category) or
+  isDeadCode4QueryMetadata(query, queryId, ruleId, category) or
   isDeclarationsQueryMetadata(query, queryId, ruleId, category) or
   isExceptionSafetyQueryMetadata(query, queryId, ruleId, category) or
   isExceptions1QueryMetadata(query, queryId, ruleId, category) or
diff --git a/cpp/common/src/codingstandards/cpp/rules/invariantcondition/InvariantCondition.qll b/cpp/common/src/codingstandards/cpp/rules/invariantcondition/InvariantCondition.qll
diff --git a/cpp/misra/src/rules/RULE-0-0-2/InvariantCondition.ql b/cpp/misra/src/rules/RULE-0-0-2/InvariantCondition.ql
diff --git a/cpp/misra/test/rules/RULE-0-0-2/InvariantCondition.expected b/cpp/misra/test/rules/RULE-0-0-2/InvariantCondition.expected
diff --git a/cpp/misra/test/rules/RULE-0-0-2/InvariantCondition.qlref b/cpp/misra/test/rules/RULE-0-0-2/InvariantCondition.qlref
diff --git a/cpp/misra/test/rules/RULE-0-0-2/test.cpp b/cpp/misra/test/rules/RULE-0-0-2/test.cpp
diff --git a/rule_packages/cpp/DeadCode4.json b/rule_packages/cpp/DeadCode4.json
diff --git a/rules.csv b/rules.csv
