Merge branch 'main' into dependabot/github_actions/actions/upload-artifact-7

Author: MichaelRFairhurst

.github/workflows/standard_library_upgrade_tests.yml

@@ -28,7 +28,7 @@ jobs:
         run: |
           echo "::set-output name=matrix::$(
             jq --compact-output \
-            '.supported_environment | map([.+{os: "ubuntu-20.04-xl", codeql_standard_library_ident : .codeql_standard_library | sub("\/"; "_")}]) | flatten | {include: .}' \
+            '.supported_environment | map([.+{os: "ubuntu-22.04-xl", codeql_standard_library_ident : .codeql_standard_library | sub("\/"; "_")}]) | flatten | {include: .}' \
             supported_codeql_configs.json
           )"
 

.github/workflows/verify-standard-library-dependencies.yml

@@ -31,7 +31,7 @@ jobs:
         run: |
           echo "::set-output name=matrix::$(
             jq --compact-output \
-            '.supported_environment | map([.+{os: "ubuntu-20.04-xl", codeql_standard_library_ident : .codeql_standard_library | sub("\/"; "_")}]) | flatten | {include: .}' \
+            '.supported_environment | map([.+{os: "ubuntu-22.04-xl", codeql_standard_library_ident : .codeql_standard_library | sub("\/"; "_")}]) | flatten | {include: .}' \
             supported_codeql_configs.json
           )"
 

change_notes/2026-02-21-share-implementation-of-m5-14-1.md

@@ -0,0 +1,2 @@
+ - `M5-14-1` - `RightHandOperandOfALogicalAndOperatorsContainSideEffects.ql`:
+   - Implementation has been refactored to share logic with Rule 8.14.1. No observable changes to results expected.

cpp/autosar/src/rules/M5-14-1/RightHandOperandOfALogicalAndOperatorsContainSideEffects.ql

@@ -16,15 +16,14 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.SideEffect
-import codingstandards.cpp.sideeffect.DefaultEffects
-import codingstandards.cpp.Expr
+import codingstandards.cpp.rules.shortcircuitedpersistentsideeffectshared.ShortCircuitedPersistentSideEffectShared
 
-from BinaryLogicalOperation op, Expr rhs
-where
-  not isExcluded(op,
-    SideEffects1Package::rightHandOperandOfALogicalAndOperatorsContainSideEffectsQuery()) and
-  rhs = op.getRightOperand() and
-  hasSideEffect(rhs) and
-  not rhs instanceof UnevaluatedExprExtension
-select op, "The $@ may have a side effect that is not always evaluated.", rhs, "right-hand operand"
+module RightHandOperandOfALogicalAndOperatorsContainSideEffectsConfig implements
+  ShortCircuitedPersistentSideEffectSharedConfigSig
+{
+  Query getQuery() {
+    result = SideEffects1Package::rightHandOperandOfALogicalAndOperatorsContainSideEffectsQuery()
+  }
+}
+
+import ShortCircuitedPersistentSideEffectShared<RightHandOperandOfALogicalAndOperatorsContainSideEffectsConfig>

cpp/autosar/test/rules/M5-14-1/RightHandOperandOfALogicalAndOperatorsContainSideEffects.expected

@@ -0,0 +1 @@
+cpp/common/test/rules/shortcircuitedpersistentsideeffectshared/ShortCircuitedPersistentSideEffectShared.ql

cpp/autosar/test/rules/M5-14-1/RightHandOperandOfALogicalAndOperatorsContainSideEffects.qlref

@@ -72,12 +72,14 @@ import Scope
 import SideEffects1
 import SideEffects2
 import SideEffects4
+import SideEffects5
 import SmartPointers1
 import SmartPointers2
 import Statements
 import Strings
 import Templates
 import Toolchain
+import Toolchain3
 import Trigraph
 import TrustBoundaries
 import TypeRanges
@@ -156,12 +158,14 @@ newtype TCPPQuery =
   TSideEffects1PackageQuery(SideEffects1Query q) or
   TSideEffects2PackageQuery(SideEffects2Query q) or
   TSideEffects4PackageQuery(SideEffects4Query q) or
+  TSideEffects5PackageQuery(SideEffects5Query q) or
   TSmartPointers1PackageQuery(SmartPointers1Query q) or
   TSmartPointers2PackageQuery(SmartPointers2Query q) or
   TStatementsPackageQuery(StatementsQuery q) or
   TStringsPackageQuery(StringsQuery q) or
   TTemplatesPackageQuery(TemplatesQuery q) or
   TToolchainPackageQuery(ToolchainQuery q) or
+  TToolchain3PackageQuery(Toolchain3Query q) or
   TTrigraphPackageQuery(TrigraphQuery q) or
   TTrustBoundariesPackageQuery(TrustBoundariesQuery q) or
   TTypeRangesPackageQuery(TypeRangesQuery q) or
@@ -240,12 +244,14 @@ predicate isQueryMetadata(Query query, string queryId, string ruleId, string cat
   isSideEffects1QueryMetadata(query, queryId, ruleId, category) or
   isSideEffects2QueryMetadata(query, queryId, ruleId, category) or
   isSideEffects4QueryMetadata(query, queryId, ruleId, category) or
+  isSideEffects5QueryMetadata(query, queryId, ruleId, category) or
   isSmartPointers1QueryMetadata(query, queryId, ruleId, category) or
   isSmartPointers2QueryMetadata(query, queryId, ruleId, category) or
   isStatementsQueryMetadata(query, queryId, ruleId, category) or
   isStringsQueryMetadata(query, queryId, ruleId, category) or
   isTemplatesQueryMetadata(query, queryId, ruleId, category) or
   isToolchainQueryMetadata(query, queryId, ruleId, category) or
+  isToolchain3QueryMetadata(query, queryId, ruleId, category) or
   isTrigraphQueryMetadata(query, queryId, ruleId, category) or
   isTrustBoundariesQueryMetadata(query, queryId, ruleId, category) or
   isTypeRangesQueryMetadata(query, queryId, ruleId, category) or

cpp/autosar/test/rules/M5-14-1/RightHandOperandOfALogicalAndOperatorsContainSideEffects.testref

@@ -0,0 +1,26 @@
+//** THIS FILE IS AUTOGENERATED, DO NOT MODIFY DIRECTLY.  **/
+import cpp
+import RuleMetadata
+import codingstandards.cpp.exclusions.RuleMetadata
+
+newtype SideEffects5Query = TShortCircuitedPersistentSideEffectQuery()
+
+predicate isSideEffects5QueryMetadata(Query query, string queryId, string ruleId, string category) {
+  query =
+    // `Query` instance for the `shortCircuitedPersistentSideEffect` query
+    SideEffects5Package::shortCircuitedPersistentSideEffectQuery() and
+  queryId =
+    // `@id` for the `shortCircuitedPersistentSideEffect` query
+    "cpp/misra/short-circuited-persistent-side-effect" and
+  ruleId = "RULE-8-14-1" and
+  category = "advisory"
+}
+
+module SideEffects5Package {
+  Query shortCircuitedPersistentSideEffectQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `shortCircuitedPersistentSideEffect` query
+      TQueryCPP(TSideEffects5PackageQuery(TShortCircuitedPersistentSideEffectQuery()))
+  }
+}