Merge origin/main into unified/conditional-compilation

Preserve conditional compilation handling while adopting main's explicit empty content for unsupported Swift syntax.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: a9225dea-8342-448b-88ec-ba9587d93816

Author: paldepind

.github/dependabot.yml

@@ -4,16 +4,22 @@ updates:
     directory: "ruby"
     schedule:
       interval: "daily"
+    cooldown:
+      default-days: 7
 
   - package-ecosystem: "cargo"
     directory: "ql"
     schedule:
       interval: "daily"
+    cooldown:
+      default-days: 7
 
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: "daily"
+    cooldown:
+      default-days: 7
     ignore:
       - dependency-name: '*'
         update-types: ['version-update:semver-patch', 'version-update:semver-minor']
@@ -22,6 +28,8 @@ updates:
     directory: "go/extractor"
     schedule:
       interval: "daily"
+    cooldown:
+      default-days: 7
     allow:
       - dependency-name: "golang.org/x/mod"
       - dependency-name: "golang.org/x/tools"
@@ -36,6 +44,8 @@ updates:
     directory: "go/ql/test"
     schedule:
       interval: "monthly"
+    cooldown:
+      default-days: 7
     ignore:
       - dependency-name: "*"
     reviewers:
@@ -45,5 +55,7 @@ updates:
     directory: "/"
     schedule:
       interval: weekly
+    cooldown:
+      default-days: 7
     exclude-paths:
       - "misc/bazel/registry/**"

.github/workflows/codeql-analysis.yml

@@ -34,7 +34,7 @@ jobs:
     - name: Setup dotnet
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 10.0.100
+        dotnet-version: 10.0.201
 
     - name: Checkout repository
       uses: actions/checkout@v5

.github/workflows/cpp-bmn.yml

@@ -0,0 +1,47 @@
+name: C/C++ build mode none extractor
+
+on:
+  pull_request:
+    paths: &bmn_paths
+      - "cpp/extractor/bmn/**"
+      - "misc/bazel/3rdparty/cpp_bmn_deps/**"
+      - "misc/bazel/3rdparty/cpp_bmn_deps_extension.bzl"
+      - "misc/bazel/3rdparty/update_cpp_bmn_deps.sh"
+      - "misc/bazel/3rdparty/BUILD.bazel"
+      - "misc/bazel/rust.bzl"
+      - "MODULE.bazel"
+      - ".github/workflows/cpp-bmn.yml"
+  push:
+    branches:
+      - main
+      - "rc/*"
+    paths: *bmn_paths
+
+permissions:
+  contents: read
+
+jobs:
+  cargo:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: cpp/extractor/bmn
+    steps:
+      - uses: actions/checkout@v5
+      - name: Check formatting
+        run: cargo fmt --check
+      - name: Check
+        run: cargo check
+      - name: Clippy
+        run: cargo clippy -- -D warnings
+      - name: Test
+        run: cargo test
+
+  bazel:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v5
+      - name: Build
+        run: bazel build //cpp/extractor/bmn:bmn
+      - name: Test
+        run: bazel test //cpp/extractor/bmn:tests

.github/workflows/csharp-qltest.yml

@@ -51,14 +51,14 @@ jobs:
       - name: Setup dotnet
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 10.0.100
+          dotnet-version: 10.0.201
       - name: Extractor unit tests
         run: |
           dotnet tool restore
-          dotnet test -p:RuntimeFrameworkVersion=10.0.0 extractor/Semmle.Util.Tests
-          dotnet test -p:RuntimeFrameworkVersion=10.0.0 extractor/Semmle.Extraction.Tests
-          dotnet test -p:RuntimeFrameworkVersion=10.0.0 autobuilder/Semmle.Autobuild.CSharp.Tests
-          dotnet test -p:RuntimeFrameworkVersion=10.0.0 autobuilder/Semmle.Autobuild.Cpp.Tests
+          dotnet test -p:RuntimeFrameworkVersion=10.0.5 extractor/Semmle.Util.Tests
+          dotnet test -p:RuntimeFrameworkVersion=10.0.5 extractor/Semmle.Extraction.Tests
+          dotnet test -p:RuntimeFrameworkVersion=10.0.5 autobuilder/Semmle.Autobuild.CSharp.Tests
+          dotnet test -p:RuntimeFrameworkVersion=10.0.5 autobuilder/Semmle.Autobuild.Cpp.Tests
         shell: bash
   stubgentest:
     runs-on: ubuntu-latest

.pre-commit-config.yaml

@@ -85,3 +85,10 @@ repos:
         language: system
         entry: python3 rust/lint.py
         pass_filenames: false
+
+      - id: cpp-bmn-lint
+        name: Run fmt and clippy on C/C++ BMN Rust code
+        files: ^cpp/extractor/bmn/(.*rs|Cargo.toml)$
+        language: system
+        entry: cpp/extractor/bmn/lint --check
+        pass_filenames: false

Cargo.lock

@@ -17,20 +17,20 @@ local_path_override(
 bazel_dep(name = "platforms", version = "1.1.0")
 bazel_dep(name = "rules_cc", version = "0.2.27")
 bazel_dep(name = "rules_go", version = "0.65.0")
-bazel_dep(name = "rules_java", version = "9.6.1")
+bazel_dep(name = "rules_java", version = "9.9.0")
 bazel_dep(name = "rules_pkg", version = "1.2.0")
 bazel_dep(name = "rules_nodejs", version = "6.7.7")
 bazel_dep(name = "rules_python", version = "2.4.6")
 bazel_dep(name = "rules_shell", version = "0.8.0")
 bazel_dep(name = "bazel_skylib", version = "1.9.2")
 bazel_dep(name = "abseil-cpp", version = "20260817.0", repo_name = "absl")
 bazel_dep(name = "nlohmann_json", version = "3.12.0.bcr.2", repo_name = "json")
-bazel_dep(name = "fmt", version = "12.1.0-codeql.1")
+bazel_dep(name = "fmt", version = "12.2.0.bcr.1-codeql.1")
 bazel_dep(name = "rules_kotlin", version = "2.4.21-codeql.1")
 bazel_dep(name = "gazelle", version = "0.54.0")
-bazel_dep(name = "rules_dotnet", version = "0.21.5-codeql.1")
+bazel_dep(name = "rules_dotnet", version = "0.22.2-codeql.1")
 bazel_dep(name = "googletest", version = "1.18.0.bcr.1")
-bazel_dep(name = "rules_rust", version = "0.74.0")
+bazel_dep(name = "rules_rust", version = "0.75.0")
 bazel_dep(name = "rules_swift", version = "4.0.0-rc5-codeql.3")
 bazel_dep(name = "swift-syntax", version = "604.0.0")
 bazel_dep(name = "zstd", version = "1.5.7.bcr.3")
@@ -120,6 +120,30 @@ use_repo(
     "vendor_py__tree-sitter-graph-0.12.0",
 )
 
+# deps for C/C++ build mode none extractor
+# keep in sync by running `misc/bazel/3rdparty/update_cpp_bmn_deps.sh`
+cpp_bmn_deps = use_extension("//misc/bazel/3rdparty:cpp_bmn_deps_extension.bzl", "b")
+use_repo(
+    cpp_bmn_deps,
+    "vendor_cpp_bmn",
+    "vendor_cpp_bmn__all_asserts-2.3.3",
+    "vendor_cpp_bmn__anyhow-1.0.98",
+    "vendor_cpp_bmn__cached-0.54.0",
+    "vendor_cpp_bmn__chrono-0.4.41",
+    "vendor_cpp_bmn__itertools-0.14.0",
+    "vendor_cpp_bmn__num_cpus-1.17.0",
+    "vendor_cpp_bmn__os_str_bytes-7.1.1",
+    "vendor_cpp_bmn__rayon-1.11.0",
+    "vendor_cpp_bmn__regex-1.11.1",
+    "vendor_cpp_bmn__serde-1.0.219",
+    "vendor_cpp_bmn__serde_json-1.0.140",
+    "vendor_cpp_bmn__serde_with-1.14.0",
+    "vendor_cpp_bmn__tempfile-3.20.0",
+    "vendor_cpp_bmn__walkdir-2.5.0",
+    "vendor_cpp_bmn__which-8.0.0",
+    "vendor_cpp_bmn__zip-6.0.0",
+)
+
 # deps for ruby+rust
 # keep in sync by running `misc/bazel/3rdparty/update_cargo_deps.sh`
 tree_sitter_extractors_deps = use_extension("//misc/bazel/3rdparty:tree_sitter_extractors_extension.bzl", "r")
@@ -206,7 +230,7 @@ http_archive(
 )
 
 dotnet = use_extension("@rules_dotnet//dotnet:extensions.bzl", "dotnet")
-dotnet.toolchain(dotnet_version = "10.0.100")
+dotnet.toolchain(dotnet_version = "10.0.201")
 use_repo(dotnet, "dotnet_toolchains")
 
 register_toolchains("@dotnet_toolchains//:all")

MODULE.bazel

@@ -0,0 +1,2 @@
+/target
+

cpp/extractor/bmn/.gitignore

@@ -0,0 +1,33 @@
+load("@rules_rust//rust:defs.bzl", "rust_test")
+load("//misc/bazel:rust.bzl", "codeql_rust_binary")
+load("//misc/bazel/3rdparty/cpp_bmn_deps:defs.bzl", "all_crate_deps")
+
+exports_files([
+    "Cargo.lock",
+    "Cargo.toml",
+])
+
+codeql_rust_binary(
+    name = "bmn",
+    srcs = glob(["src/**/*.rs"]),
+    proc_macro_deps = all_crate_deps(proc_macro = True),
+    visibility = ["//visibility:public"],
+    deps = all_crate_deps(normal = True),
+)
+
+rust_test(
+    name = "unit_tests",
+    crate = ":single_arch/bmn",
+    data = glob([
+        "tests/resources/**",
+        "Cargo.toml",
+    ]),
+    env = {
+        "BMN_TEST_MANIFEST": "$(rlocationpath :Cargo.toml)",
+    },
+)
+
+test_suite(
+    name = "tests",
+    tests = [":unit_tests"],
+)