Merge branch 'master' into updates/various

helly25 · web-flow · commit a501102db793 · 2025-11-01T13:32:15.000+01:00
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1 +1 @@
-* @rrbutani @jsharpe @fmeum @helly25
+* @rrbutani @jsharpe @fmeum @helly25 @dzbarsky
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -41,7 +41,7 @@ jobs:
         env:
           USE_BAZEL_VERSION: ${{ matrix.bazel_version }}
           USE_BZLMOD: ${{ matrix.bzlmod }}
-        run: tests/scripts/run_tests.sh
+        run: tests/scripts/run_tests.sh -O
   toolchain_test:
     strategy:
       fail-fast: false
@@ -122,7 +122,7 @@ jobs:
       - name: Test
         env:
           USE_BZLMOD: ${{ matrix.bzlmod }}
-        run: tests/scripts/run_tests.sh -t @llvm_toolchain_with_absolute_paths//:cc-toolchain-x86_64-linux
+        run: tests/scripts/run_tests.sh -t @llvm_toolchain_with_absolute_paths//:cc-toolchain-x86_64-linux -O
   sys_paths_test:
     strategy:
       fail-fast: false
@@ -133,6 +133,7 @@ jobs:
       - uses: actions/checkout@v5
       - run: tests/scripts/ubuntu_install_libtinfo.sh
       - name: Download and Extract LLVM distribution
+        # The downloaded version here must match version specified as '-v' arg to run_tests.sh below.
         env:
           release: llvmorg-16.0.0
           archive: clang+llvm-16.0.0-x86_64-linux-gnu-ubuntu-18.04
@@ -142,4 +143,4 @@ jobs:
       - name: Test
         env:
           USE_BZLMOD: ${{ matrix.bzlmod }}
-        run: tests/scripts/run_tests.sh -t @llvm_toolchain_with_system_llvm//:cc-toolchain-x86_64-linux
+        run: tests/scripts/run_tests.sh -t @llvm_toolchain_with_system_llvm//:cc-toolchain-x86_64-linux -v 16.0.0
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -19,11 +19,11 @@ module(
     compatibility_level = 0,
 )
 
-bazel_dep(name = "bazel_features", version = "1.36.0")
-bazel_dep(name = "bazel_skylib", version = "1.5.0")
-bazel_dep(name = "aspect_bazel_lib", version = "2.0.0")
-bazel_dep(name = "rules_cc", version = "0.2.2")
-bazel_dep(name = "platforms", version = "0.0.8")
+bazel_dep(name = "bazel_features", version = "1.38.0")
+bazel_dep(name = "bazel_skylib", version = "1.8.2")
+bazel_dep(name = "aspect_bazel_lib", version = "2.19.3")
+bazel_dep(name = "rules_cc", version = "0.2.8")
+bazel_dep(name = "platforms", version = "1.0.0")
 bazel_dep(name = "helly25_bzl", version = "0.3.1")
 
 bazel_dep(name = "tar.bzl", version = "0.6.0")
diff --git a/tests/BUILD.bazel b/tests/BUILD.bazel
@@ -81,7 +81,7 @@ build_test(
 dwp_file(
     name = "stdlib.dwp",
     src = ":stdlib_bin",
-    # NOTE: we should eventually we able to drop this; see #109.
+    # NOTE: we should eventually be able to drop this; see #109.
     override_compilation_mode = "dbg",
     target_compatible_with = [
         "@platforms//os:linux",
@@ -101,6 +101,7 @@ cc_test(
     srcs = ["omp_test.c"],
     copts = ["-fopenmp"],
     linkopts = ["-fopenmp"],
+    tags = ["manual"],
     deps = ["@llvm_toolchain//:omp"],
 )
 
@@ -114,9 +115,19 @@ cc_test(
     srcs = ["omp_test.cc"],
     copts = ["-fopenmp"],
     linkopts = ["-fopenmp"],
+    tags = ["manual"],
     deps = ["@llvm_toolchain//:omp"],
 )
 
+test_suite(
+    name = "omp_tests",
+    tags = ["manual"],
+    tests = [
+        ":omp_test",
+        ":omp_test_cc",
+    ],
+)
+
 sh_test(
     name = "file_dependency_test",
     srcs = ["file_dependency_test.sh"],
diff --git a/tests/MODULE.bazel b/tests/MODULE.bazel
@@ -64,10 +64,13 @@ llvm = use_extension("@toolchains_llvm//toolchain/extensions:llvm.bzl", "llvm")
 # When updating this version, also update the versions associated with
 # llvm_toolchain below, sys_paths_test in the workflows file, and xcompile_test
 # through the `llvm_toolchain_with_sysroot` toolchain.
-# We use C++17 and the first LLVM version with full suppor is 16.0.0.
+# We use C++17 and the first LLVM version with full support is 16.0.0.
 # We also use C++20 which has reasonable wide support starting with LLVM 17.0.0.
+# MacOS X86 does not exist for LLVM 17 or 18, so we allow 19 as well.
+# We also allow to override this with a environment LLVM_VERSION for testing.
 LLVM_VERSIONS = {
-    "": "first:>=17.0.0,<18",
+    "": "getenv(LLVM_VERSION,latest:>=17.0.0,<20)",
+    "darwin-x86_64": "15.0.7",  # Verify this works as opposed to using one version.
 }
 
 llvm.toolchain(
@@ -148,9 +151,10 @@ llvm.toolchain_root(
 use_repo(llvm, "llvm_toolchain_with_absolute_paths")
 
 # Toolchain example with system LLVM; tested in GitHub CI.
+# The llvm_version must match the version specified in .github/workflows/tests.yml: sys_paths_test
 llvm.toolchain(
     name = "llvm_toolchain_with_system_llvm",
-    llvm_versions = LLVM_VERSIONS,
+    llvm_versions = {"": "16.0.0"},
 )
 
 # For this toolchain to work, the LLVM distribution archive would need to be unpacked here.
diff --git a/tests/WORKSPACE b/tests/WORKSPACE
@@ -21,6 +21,17 @@ local_repository(
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
+http_archive(
+    name = "bazel_features",
+    sha256 = "07271d0f6b12633777b69020c4cb1eb67b1939c0cf84bb3944dc85cc250c0c01",
+    strip_prefix = "bazel_features-1.38.0",
+    url = "https://github.com/bazel-contrib/bazel_features/releases/download/v1.38.0/bazel_features-v1.38.0.tar.gz",
+)
+
+load("@bazel_features//:deps.bzl", "bazel_features_deps")
+
+bazel_features_deps()
+
 http_archive(
     name = "aspect_bazel_lib",
     sha256 = "6fd3b1e1a38ca744f9664be4627ced80895c7d2ee353891c172f1ab61309c933",
@@ -50,8 +61,11 @@ load("@toolchains_llvm//toolchain:rules.bzl", "llvm_toolchain")
 # through the `llvm_toolchain_with_sysroot` toolchain.
 # We use C++17 and the first LLVM version with full suppor is 16.0.0.
 # We also use C++20 which has reasonable wide support starting with LLVM 17.0.0.
+# MacOS X86 does not exist for LLVM 17 or 18, so we allow 19 as well.
+# We also allow to override this with a environment LLVM_VERSION for testing.
 LLVM_VERSIONS = {
-    "": "first:>=17.0.0,<18",
+    "": "getenv(LLVM_VERSION,latest:>=17.0.0,<20)",
+    "darwin-x86_64": "15.0.7",  # Verify this works as opposed to using one version.
 }
 
 llvm_toolchain(
@@ -123,9 +137,10 @@ llvm_toolchain(
 )
 
 ## Toolchain example with system LLVM; tested in GitHub CI.
+# The llvm_version must match the version specified in .github/workflows/tests.yml: sys_paths_test
 llvm_toolchain(
     name = "llvm_toolchain_with_system_llvm",
-    llvm_versions = LLVM_VERSIONS,
+    llvm_version = "getenv(LLVM_VERSION)",
     # For this toolchain to work, the LLVM distribution archive would need to be unpacked here.
     toolchain_roots = {"": "/opt/llvm-16"},
 )
@@ -327,8 +342,8 @@ protobuf_deps()
 
 http_archive(
     name = "rules_java",
-    sha256 = "f79a6e10cdd213ceded45884914bb8c68f0c8d41144e74ec89ebb74984c409ac",
-    urls = ["https://github.com/bazelbuild/rules_java/releases/download/8.8.0/rules_java-8.8.0.tar.gz"],
+    sha256 = "1b30698d89dccd9dc01b1a4ad7e9e5c6e669cdf1918dbb050334e365b40a1b5e",
+    urls = ["https://github.com/bazelbuild/rules_java/releases/download/8.16.1/rules_java-8.16.1.tar.gz"],
 )
 
 load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")
@@ -339,10 +354,6 @@ load("@rules_foreign_cc//foreign_cc:repositories.bzl", "rules_foreign_cc_depende
 
 rules_foreign_cc_dependencies()
 
-load("@bazel_features//:deps.bzl", "bazel_features_deps")
-
-bazel_features_deps()
-
 load("@rules_cc//cc:extensions.bzl", "compatibility_proxy_repo")
 
 compatibility_proxy_repo()
diff --git a/tests/scripts/archlinux_test.sh b/tests/scripts/archlinux_test.sh
@@ -32,6 +32,6 @@ set -exuo pipefail
 
 # Run tests
 cd /src
-tests/scripts/run_tests.sh -t ${toolchain}
+tests/scripts/run_tests.sh -O -t ${toolchain}
 """
 done
diff --git a/tests/scripts/debian_test.sh b/tests/scripts/debian_test.sh
@@ -36,6 +36,6 @@ apt-get -qq -y install curl libtinfo5 libxml2 zlib1g-dev >/dev/null
 
 # Run tests
 cd /src
-tests/scripts/run_tests.sh
+tests/scripts/run_tests.sh -O
 """
 done
diff --git a/tests/scripts/fedora_test.sh b/tests/scripts/fedora_test.sh
@@ -32,6 +32,6 @@ dnf install -qy glibc-headers ncurses-compat-libs
 
 # Run tests
 cd /src
-tests/scripts/run_tests.sh
+tests/scripts/run_tests.sh -O
 """
 done
diff --git a/tests/scripts/linux_sysroot_test.sh b/tests/scripts/linux_sysroot_test.sh
@@ -19,6 +19,8 @@ images=(
   "ubuntu:22.04"
 )
 
+LLVM_VERSION="first:>=15.0.0,<17"
+
 git_root=$(git rev-parse --show-toplevel)
 readonly git_root
 
@@ -36,6 +38,6 @@ apt-get -qq -y install curl libtinfo5 libxml2 zlib1g-dev >/dev/null
 
 # Run tests
 cd /src
-tests/scripts/run_tests.sh -t '@llvm_toolchain_with_sysroot//:cc-toolchain-x86_64-linux'
+tests/scripts/run_tests.sh -t '@llvm_toolchain_with_sysroot//:cc-toolchain-x86_64-linux' -v '${LLVM_VERSION}'
 """
 done
diff --git a/tests/scripts/run_tests.sh b/tests/scripts/run_tests.sh
@@ -16,18 +16,28 @@
 set -euo pipefail
 
 toolchain_name=""
-disable_wasm_tests=""
+enable_omp_targets="1"
+enable_wasm_tests="1"
+LLVM_VERSION=""
 
-while getopts "t:hW" opt; do
+while getopts "hOt:v:W" opt; do
   case "${opt}" in
-  "t") toolchain_name="${OPTARG}" ;;
   "h")
     echo "Usage:"
     echo "-t - Toolchain name to use for testing; default is llvm_toolchain"
     exit 2
     ;;
+  "O")
+    enable_omp_targets=""
+    ;;
+  "t")
+    toolchain_name="${OPTARG}"
+    ;;
+  "v")
+    LLVM_VERSION="${OPTARG}"
+    ;;
   "W")
-    disable_wasm_tests="yes"
+    enable_wasm_tests=""
     ;;
   *)
     echo "invalid option: -${OPTARG}"
@@ -56,10 +66,21 @@ targets=(
 # :test_cxx_standard_is_20 builds with a version of the default toolchain, if
 # we're trying to build with a different toolchain then it's likely the default
 # toolchain won't work so :test_cxx_standard_is_20 won't build.
-if [[ -z ${toolchain_name} ]]; then
+if [[ -z "${toolchain_name}" ]]; then
   targets+=("//:test_cxx_standard_is_20")
 fi
 
+if [[ -n "${enable_omp_targets}" ]]; then
+  targets+=("//:omp_tests")
+fi
+
+if [[ -n "${LLVM_VERSION}" ]]; then
+  echo "LLVM_VERSION=${LLVM_VERSION}"
+  common_test_args+=(
+    "--repo_env=LLVM_VERSION=${LLVM_VERSION}"
+  )
+fi
+
 "${bazel}" ${TEST_MIGRATION:+"--strict"} --bazelrc=/dev/null test \
   "${common_test_args[@]}" "${test_args[@]}" "${targets[@]}"
 
@@ -72,7 +93,7 @@ fi
 # to run out of disk space.
 #
 # Mitigate this by expunging the workspace before trying to build Wasm targets.
-if [[ -z ${toolchain_name} && -z ${disable_wasm_tests} ]]; then
+if [[ -z "${toolchain_name}" ]] && [[ -n "${enable_wasm_tests}" ]]; then
   # Redefine `test_args` without `--linkopt=-Wl,-v`, which breaks `wasm-ld`.
   #
   # https://github.com/llvm/llvm-project/issues/112836
diff --git a/tests/scripts/suse_leap_test.sh b/tests/scripts/suse_leap_test.sh
@@ -38,6 +38,6 @@ zypper -n install curl gcc libc++1
 
 # Run tests
 cd /src
-tests/scripts/run_tests.sh -t ${toolchain}
+tests/scripts/run_tests.sh -O -t ${toolchain}
 """
 done
diff --git a/tests/scripts/suse_tumbleweed_test.sh b/tests/scripts/suse_tumbleweed_test.sh
@@ -38,6 +38,6 @@ zypper -n install curl gcc libc++1
 
 # Run tests
 cd /src
-tests/scripts/run_tests.sh -t ${toolchain}
+tests/scripts/run_tests.sh -O -t ${toolchain}
 """
 done
diff --git a/tests/scripts/ubuntu_20_04_test.sh b/tests/scripts/ubuntu_20_04_test.sh
@@ -19,6 +19,8 @@ images=(
   "ubuntu:20.04"
 )
 
+LLVM_VERSION="first:>=15.0.0,<17"
+
 git_root=$(git rev-parse --show-toplevel)
 readonly git_root
 
@@ -40,6 +42,6 @@ disable_wasm_tests='-W'
 
 # Run tests
 cd /src
-tests/scripts/run_tests.sh \${disable_wasm_tests}
+tests/scripts/run_tests.sh -v '${LLVM_VERSION}' \${disable_wasm_tests}
 """
 done
diff --git a/tests/scripts/ubuntu_22_04_test.sh b/tests/scripts/ubuntu_22_04_test.sh
@@ -36,6 +36,6 @@ apt-get -qq -y install curl libtinfo5 libxml2 zlib1g-dev >/dev/null
 
 # Run tests
 cd /src
-tests/scripts/run_tests.sh
+tests/scripts/run_tests.sh -O
 """
 done
diff --git a/toolchain/BUILD.llvm_repo.tpl b/toolchain/BUILD.llvm_repo.tpl
@@ -61,27 +61,49 @@ filegroup(
     ),
 )
 
+# This filegroup should only have source directories, not individual files.
+# We rely on this assumption in system_module_map.bzl.
+filegroup(
+    name = "cxx_builtin_include",
+    srcs = [
+        "include/c++",
+        "lib/clang/{LLVM_VERSION}/include",
+    ],
+)
+
+filegroup(
+    name = "extra_config_site",
+    srcs = glob(["include/*/c++/v1/__config_site"], allow_empty = True)
+)
+
 filegroup(
     name = "bin",
     srcs = glob(["bin/**"]),
 )
 
 filegroup(
     name = "lib",
-    srcs = glob(
-        [
-            "lib/**/libc++*.a",
-            "lib/**/libunwind.a",
-            # TODO(zbarsky): `lib/clang/<VERSION>` can be a source directory
-            "lib/clang/*/lib/**",
-            # clang_rt.*.o supply crtbegin and crtend sections.
-            "lib/**/clang_rt.*.o",
-        ],
-        allow_empty = True,
-    ),
-    # Include the .dylib files in the linker sandbox even though they will
-    # not be available at runtime to allow sanitizers to work locally.
-    # Any library linked from the toolchain to be released should be linked statically.
+    srcs = [
+        # Include the .dylib files in the linker sandbox even though they will
+        # not be available at runtime to allow sanitizers to work locally.
+        # Any library linked from the toolchain to be released should be linked statically.
+        "lib/clang/{LLVM_VERSION}/lib",
+    ] + glob([
+        "lib/**/libc++*.a",
+        "lib/**/libunwind.a",
+    ]),
+)
+
+filegroup(
+    name = "lib_legacy",
+    srcs = glob([
+        # Include the .dylib files in the linker sandbox even though they will
+        # not be available at runtime to allow sanitizers to work locally.
+        # Any library linked from the toolchain to be released should be linked statically.
+        "lib/clang/{LLVM_VERSION}/lib/**",
+        "lib/**/libc++*.a",
+        "lib/**/libunwind.a",
+    ]),
 )
 
 filegroup(
diff --git a/toolchain/BUILD.toolchain.tpl b/toolchain/BUILD.toolchain.tpl
diff --git a/toolchain/cc_toolchain_config.bzl b/toolchain/cc_toolchain_config.bzl
diff --git a/toolchain/deps.bzl b/toolchain/deps.bzl
diff --git a/toolchain/internal/configure.bzl b/toolchain/internal/configure.bzl
diff --git a/toolchain/internal/llvm_distributions.bzl b/toolchain/internal/llvm_distributions.bzl
diff --git a/toolchain/internal/repo.bzl b/toolchain/internal/repo.bzl
diff --git a/toolchain/internal/system_module_map.bzl b/toolchain/internal/system_module_map.bzl
diff --git a/toolchain/sysroot.bzl b/toolchain/sysroot.bzl

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-* @rrbutani @jsharpe @fmeum @helly25`
	`1`	`+* @rrbutani @jsharpe @fmeum @helly25 @dzbarsky`