Skip to content

Commit b125d2c

Browse files
committed
Merge branch 'main' into cppfiles
2 parents 58c4bf5 + 031bd8b commit b125d2c

File tree

612 files changed

+7690
-5007
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

612 files changed

+7690
-5007
lines changed

.clang-format

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

.github/workflows/swift.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,15 @@ jobs:
7373
steps:
7474
- uses: actions/checkout@v4
7575
- uses: ./swift/actions/run-integration-tests
76+
clang-format:
77+
if : ${{ github.event_name == 'pull_request' }}
78+
runs-on: ubuntu-latest
79+
steps:
80+
- uses: actions/checkout@v4
81+
- uses: pre-commit/action@646c83fcd040023954eafda54b4db0192ce70507
82+
name: Check that python code is properly formatted
83+
with:
84+
extra_args: clang-format --all-files
7685
codegen:
7786
if : ${{ github.event_name == 'pull_request' }}
7887
runs-on: ubuntu-latest
@@ -82,12 +91,12 @@ jobs:
8291
- uses: actions/setup-python@v4
8392
with:
8493
python-version-file: 'swift/.python-version'
85-
- uses: pre-commit/action@v3.0.0
94+
- uses: pre-commit/action@646c83fcd040023954eafda54b4db0192ce70507
8695
name: Check that python code is properly formatted
8796
with:
8897
extra_args: autopep8 --all-files
8998
- uses: ./.github/actions/fetch-codeql
90-
- uses: pre-commit/action@v3.0.0
99+
- uses: pre-commit/action@646c83fcd040023954eafda54b4db0192ce70507
91100
name: Check that QL generated code was checked in
92101
with:
93102
extra_args: swift-codegen --all-files

.pre-commit-config.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,9 @@ repos:
1010
exclude: /test/.*$(?<!\.ql)(?<!\.qll)(?<!\.qlref)|.*\.patch
1111

1212
- repo: https://github.com/pre-commit/mirrors-clang-format
13-
rev: v13.0.1
13+
rev: v17.0.6
1414
hooks:
1515
- id: clang-format
16-
files: ^swift/.*\.(h|c|cpp)$
1716

1817
- repo: https://github.com/pre-commit/mirrors-autopep8
1918
rev: v1.6.0

config/identical-files.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -473,10 +473,6 @@
473473
"ruby/ql/lib/codeql/ruby/frameworks/data/internal/ApiGraphModelsExtensions.qll",
474474
"python/ql/lib/semmle/python/frameworks/data/internal/ApiGraphModelsExtensions.qll"
475475
],
476-
"Typo database": [
477-
"javascript/ql/src/Expressions/TypoDatabase.qll",
478-
"ql/ql/src/codeql_ql/style/TypoDatabase.qll"
479-
],
480476
"Swift declarations test file": [
481477
"swift/ql/test/extractor-tests/declarations/declarations.swift",
482478
"swift/ql/test/library-tests/ast/declarations.swift"

cpp/ql/lib/CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
## 0.12.4
2+
3+
### Minor Analysis Improvements
4+
5+
* Deleted many deprecated predicates and classes with uppercase `XML`, `SSA`, `SAL`, `SQL`, etc. in their names. Use the PascalCased versions instead.
6+
* Deleted the deprecated `StrcatFunction` class, use `semmle.code.cpp.models.implementations.Strcat.qll` instead.
7+
18
## 0.12.3
29

310
### Deprecated APIs
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
## 0.12.4
2+
3+
### Minor Analysis Improvements
4+
5+
* Deleted many deprecated predicates and classes with uppercase `XML`, `SSA`, `SAL`, `SQL`, etc. in their names. Use the PascalCased versions instead.
6+
* Deleted the deprecated `StrcatFunction` class, use `semmle.code.cpp.models.implementations.Strcat.qll` instead.

cpp/ql/lib/codeql-pack.release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
lastReleaseVersion: 0.12.3
2+
lastReleaseVersion: 0.12.4

cpp/ql/lib/qlpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: codeql/cpp-all
2-
version: 0.12.4-dev
2+
version: 0.12.5-dev
33
groups: cpp
44
dbscheme: semmlecode.cpp.dbscheme
55
extractor: cpp

cpp/ql/lib/semmle/code/cpp/Class.qll

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -380,9 +380,6 @@ class Class extends UserType {
380380
*/
381381
predicate isPod() { is_pod_class(underlyingElement(this)) }
382382

383-
/** DEPRECATED: Alias for isPod */
384-
deprecated predicate isPOD() { this.isPod() }
385-
386383
/**
387384
* Holds if this class, struct or union is a standard-layout class
388385
* [N4140 9(7)]. Also holds for structs in C programs.

cpp/ql/lib/semmle/code/cpp/PODType03.qll

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,6 @@ predicate isPodClass03(Class c) {
104104
)
105105
}
106106

107-
/** DEPRECATED: Alias for isPodClass03 */
108-
deprecated predicate isPODClass03 = isPodClass03/1;
109-
110107
/**
111108
* Holds if `t` is a POD type, according to the rules specified in
112109
* C++03 3.9(10):
@@ -126,6 +123,3 @@ predicate isPodType03(Type t) {
126123
isPodType03(ut.(SpecifiedType).getUnspecifiedType())
127124
)
128125
}
129-
130-
/** DEPRECATED: Alias for isPodType03 */
131-
deprecated predicate isPODType03 = isPodType03/1;

0 commit comments

Comments
 (0)