Skip to content

Commit 3490067

Browse files
committed
Merge branch 'main' into henrymercer/rc-3.15-mergeback
2 parents d5bccd5 + 72e2910 commit 3490067

File tree

927 files changed

+15318
-11770
lines changed

Some content is hidden

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

927 files changed

+15318
-11770
lines changed

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.2.1
1+
5f5d70b6c4d2fb1a889479569107f1692239e8a7

.github/workflows/buildifier.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ jobs:
2424
extra_args: >
2525
buildifier --all-files 2>&1 ||
2626
(
27-
echo -e "In order to format all bazel files, please run:\n bazel run //misc/bazel:buildifier"; exit 1
27+
echo -e "In order to format all bazel files, please run:\n bazel run //misc/bazel/buildifier"; exit 1
2828
)

.github/workflows/cpp-swift-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
with:
3838
languages: cpp
3939
config-file: ./.github/codeql/codeql-config.yml
40-
40+
4141
- name: "[Ubuntu] Remove GCC 13 from runner image"
4242
shell: bash
4343
run: |
@@ -48,7 +48,7 @@ jobs:
4848
- name: "Build Swift extractor using Bazel"
4949
run: |
5050
bazel clean --expunge
51-
bazel run //swift:create-extractor-pack --nouse_action_cache --noremote_accept_cached --noremote_upload_local_results --spawn_strategy=local --features=-layering_check
51+
bazel run //swift:create-extractor-pack --nouse_action_cache --noremote_accept_cached --noremote_upload_local_results --spawn_strategy=local
5252
bazel shutdown
5353
5454
- name: Perform CodeQL Analysis

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
.cache
88

99
# qltest projects and artifacts
10+
*.actual
1011
*/ql/test/**/*.testproj
11-
*/ql/test/**/*.actual
1212
*/ql/test/**/go.sum
1313

1414
# Visual studio temporaries, except a file used by QL4VS

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ repos:
2626
name: Format bazel files
2727
files: \.(bazel|bzl)
2828
language: system
29-
entry: bazel run //misc/bazel:buildifier
29+
entry: bazel run //misc/bazel/buildifier
3030
pass_filenames: false
3131

3232
# DISABLED: can be enabled by copying this config and installing `pre-commit` with `--config` on the copy
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
class Expr extends @expr {
2+
string toString() { none() }
3+
}
4+
5+
class Location extends @location_expr {
6+
string toString() { none() }
7+
}
8+
9+
predicate isExprWithNewBuiltin(Expr expr) {
10+
exists(int kind | exprs(expr, kind, _) | 385 <= kind and kind <= 388)
11+
}
12+
13+
from Expr expr, int kind, int kind_new, Location location
14+
where
15+
exprs(expr, kind, location) and
16+
if isExprWithNewBuiltin(expr) then kind_new = 1 else kind_new = kind
17+
select expr, kind_new, location

0 commit comments

Comments
 (0)