Merge remote-tracking branch 'origin/main' into michaelrfairhurst/package-undefined-behavior

Author: MichaelRFairhurst

.github/workflows/codeql_unit_tests.yml

@@ -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@v8
+        uses: actions/github-script@v9
         with:
           script: |
             core.setFailed('Test run job failed')

.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@v8
+      - uses: actions/github-script@v9
         if: ${{ github.event.issue.pull_request && contains(github.event.comment.body, '/test-matrix') && steps.check-write-permission.outputs.has-permission }}
         with:
           script: |

.github/workflows/dispatch-release-performance-check.yml

@@ -44,7 +44,7 @@ jobs:
           --json \
           -R github/codeql-coding-standards-release-engineering
 
-      - uses: actions/github-script@v8
+      - uses: actions/github-script@v9
         if: ${{ github.event.issue.pull_request && contains(github.event.comment.body, '/test-performance') && steps.check-write-permission.outputs.has-permission }}
         with:
           script: |

.github/workflows/upgrade_codeql_dependencies.yml

@@ -56,7 +56,7 @@ jobs:
           find c \( -name '*.ql' -or -name '*.qll' \) -print0 | xargs -0 --max-procs "$XARGS_MAX_PROCS" codeql query format --in-place
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8.1.0
+        uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1
         with:
           title: "Upgrade `github/codeql` dependency to ${{ github.event.inputs.codeql_cli_version }}"
           body: |

c/cert/src/qlpack.yml

@@ -1,5 +1,5 @@
 name: codeql/cert-c-coding-standards
-version: 2.57.0-dev
+version: 2.59.0-dev
 description: CERT C 2016
 suites: codeql-suites
 license: MIT

c/cert/src/rules/DCL40-C/ExternalIdentifiers.qll

@@ -21,42 +21,11 @@
 
 import cpp
 import codingstandards.c.cert
-import codingstandards.cpp.types.Compatible
-import ExternalIdentifiers
+import codingstandards.cpp.rules.incompatiblefunctiondeclaration.IncompatibleFunctionDeclaration
 
-predicate interestedInFunctions(
-  FunctionDeclarationEntry f1, FunctionDeclarationEntry f2, ExternalIdentifiers d
-) {
-  not f1 = f2 and
-  d = f1.getDeclaration() and
-  d = f2.getDeclaration()
+module IncompatibleFunctionDeclarationsCppConfig implements IncompatibleFunctionDeclarationConfigSig
+{
+  Query getQuery() { result = Declarations2Package::incompatibleFunctionDeclarationsQuery() }
 }
 
-predicate interestedInFunctions(FunctionDeclarationEntry f1, FunctionDeclarationEntry f2) {
-  interestedInFunctions(f1, f2, _)
-}
-
-module FuncDeclEquiv =
-  FunctionDeclarationTypeEquivalence<TypesCompatibleConfig, interestedInFunctions/2>;
-
-from ExternalIdentifiers d, FunctionDeclarationEntry f1, FunctionDeclarationEntry f2
-where
-  not isExcluded(f1, Declarations2Package::incompatibleFunctionDeclarationsQuery()) and
-  not isExcluded(f2, Declarations2Package::incompatibleFunctionDeclarationsQuery()) and
-  interestedInFunctions(f1, f2, d) and
-  (
-    //return type check
-    not FuncDeclEquiv::equalReturnTypes(f1, f2)
-    or
-    //parameter type check
-    not FuncDeclEquiv::equalParameterTypes(f1, f2)
-  ) and
-  // Apply ordering on start line, trying to avoid the optimiser applying this join too early
-  // in the pipeline
-  exists(int f1Line, int f2Line |
-    f1.getLocation().hasLocationInfo(_, f1Line, _, _, _) and
-    f2.getLocation().hasLocationInfo(_, f2Line, _, _, _) and
-    f1Line >= f2Line
-  )
-select f1, "The object $@ is not compatible with re-declaration $@", f1, f1.getName(), f2,
-  f2.getName()
+import IncompatibleFunctionDeclaration<IncompatibleFunctionDeclarationsCppConfig>

c/cert/src/rules/DCL40-C/IncompatibleFunctionDeclarations.ql

@@ -20,16 +20,10 @@
 
 import cpp
 import codingstandards.c.cert
-import ExternalIdentifiers
+import codingstandards.cpp.rules.incompatibleobjectdeclaration.IncompatibleObjectDeclaration
 
-from VariableDeclarationEntry decl1, VariableDeclarationEntry decl2
-where
-  not isExcluded(decl1, Declarations2Package::incompatibleObjectDeclarationsQuery()) and
-  not isExcluded(decl2, Declarations2Package::incompatibleObjectDeclarationsQuery()) and
-  not decl1.getUnspecifiedType() = decl2.getUnspecifiedType() and
-  decl1.getDeclaration() instanceof ExternalIdentifiers and
-  decl2.getDeclaration() instanceof ExternalIdentifiers and
-  decl1.getLocation().getStartLine() >= decl2.getLocation().getStartLine() and
-  decl1.getVariable().getName() = decl2.getVariable().getName()
-select decl1, "The object $@ is not compatible with re-declaration $@", decl1, decl1.getName(),
-  decl2, decl2.getName()
+module IncompatibleObjectDeclarationsCppConfig implements IncompatibleObjectDeclarationConfigSig {
+  Query getQuery() { result = Declarations2Package::incompatibleObjectDeclarationsQuery() }
+}
+
+import IncompatibleObjectDeclaration<IncompatibleObjectDeclarationsCppConfig>

c/cert/src/rules/DCL40-C/IncompatibleObjectDeclarations.ql

@@ -1,5 +1,5 @@
 name: codeql/cert-c-coding-standards-tests
-version: 2.57.0-dev
+version: 2.59.0-dev
 extractor: cpp
 license: MIT
 dependencies: