Skip to content

Commit 6022aa1

Browse files
authored
Merge branch 'main' into mbaluda/updateql2.9.4
2 parents 1a6a71e + 9a23aba commit 6022aa1

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

.github/touch

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

.github/workflows/bump-version.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ jobs:
2121
run: |
2222
bash ./scripts/bump_version.sh ${{ github.event.inputs.new_version }}
2323
24-
- uses: actions/checkout@v3
2524
- name: Create Pull Request
2625
uses: peter-evans/create-pull-request@v4
2726
with:
@@ -30,4 +29,4 @@ jobs:
3029
commit-message: "Version bump to ${{ github.event.inputs.new_version }}."
3130
team-reviewers: github/codeql-coding-standards
3231
delete-branch: true
33-
branch: "codeql/version-bump-${{ github.event.inputs.new_version }}"
32+
branch: "automation/version-bump-${{ github.event.inputs.new_version }}"

cpp/autosar/src/rules/A10-2-1/NonVirtualPublicOrProtectedFunctionsRedefined.ql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ where
2929
not f instanceof Operator and
3030
(
3131
exists(MemberFunction shadowingFunction |
32-
getPublicOrPrivateDerivedClass+(f.getDeclaringType()) = shadowingFunction.getDeclaringType() and
33-
f.getName() = shadowingFunction.getName() and
32+
getPublicOrPrivateDerivedClass+(f.getDeclaringType()) = subclass and
33+
f.getName() = pragma[only_bind_out](shadowingFunction.getName()) and
3434
e = shadowingFunction and
3535
description = "this member function" and
3636
subclass = shadowingFunction.getDeclaringType()

cpp/autosar/src/rules/M10-2-1/UniqueAccessibleEntityNamesInMultipleInheritance.ql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ where
5454
// and the declaring types of both declarations are not in the same inheritance hierarchy
5555
not decl1.getDeclaringType().getABaseClass*() = decl2.getDeclaringType().getABaseClass*() and
5656
// and both declarations are accessible from 'derived'
57-
decl1.isAccessibleFromClass(derived) and
58-
decl2.isAccessibleFromClass(derived) and
57+
pragma[only_bind_into](decl1).isAccessibleFromClass(derived) and
58+
pragma[only_bind_into](decl2).isAccessibleFromClass(derived) and
5959
// and the declaring type name (DTN) of decl1 is less than the DTN of decl2 (remove permutations)
6060
decl1 =
6161
rank[1](MemberEntityDeclaration decl |

cpp/common/src/codingstandards/cpp/FunctionEquivalence.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ private newtype TParameterEquivalenceClass =
6666
*/
6767
class ParameterEquivalenceClass extends TParameterEquivalenceClass {
6868
/** Gets a `Function` whose `Parameter` at `index` is part of the equivalence class. */
69-
pragma[noinline]
69+
pragma[nomagic]
7070
private Function getAFunction(int index) {
7171
exists(string qualifiedName, string typeSig |
7272
functionSignature(result, qualifiedName, typeSig) and

0 commit comments

Comments
 (0)