Merge branch 'main' into onesided_lower_bound

Author: ichaer

.ci/generate-buildkite-pipeline-premerge

@@ -9,7 +9,7 @@
 
 #
 # This file generates a Buildkite pipeline that triggers the various CI jobs for
-# the LLVM project during pre-commit CI (each time a Phabricator diff is uploaded).
+# the LLVM project during pre-commit CI.
 #
 # See https://buildkite.com/docs/agent/v3/cli-pipeline#pipeline-format.
 #
@@ -22,19 +22,18 @@ set -o pipefail
 
 # Environment variables script works with:
 
-# Fetch origin/main to have an up to date merge base for main...HEAD diff.
-git fetch origin main:main
+# Set by buildkite
+: ${BUILDKITE_PULL_REQUEST_BASE_BRANCH:=}
+: ${BUILDKITE_COMMIT:=}
+: ${BUILDKITE_BRANCH:=}
+# Fetch origin to have an up to date merge base for the diff.
+git fetch origin
 # List of files affected by this commit
-: ${MODIFIED_FILES:=$(git diff --name-only main...HEAD)}
+: ${MODIFIED_FILES:=$(git diff --name-only origin/${BUILDKITE_PULL_REQUEST_BASE_BRANCH}...HEAD)}
 # Filter rules for generic windows tests
 : ${WINDOWS_AGENTS:='{"queue": "windows"}'}
 # Filter rules for generic linux tests
 : ${LINUX_AGENTS:='{"queue": "linux"}'}
-# Service agents, for interacting with Phabricator.
-: ${SERVICE_AGENTS:='{"queue": "service"}'}
-# Set by buildkite
-: ${BUILDKITE_COMMIT:=}
-: ${BUILDKITE_BRANCH:=}
 
 reviewID="$(git log --format=%B -n 1 | sed -nE 's/^Review-ID:[[:space:]]*(.+)$/\1/p')"
 if [[ "${reviewID}" != "" ]]; then
@@ -107,7 +106,7 @@ function add-dependencies() {
       done
     ;;
     compiler-rt|libc|openmp)
-      echo clang
+      echo clang lld
     ;;
     flang|lldb)
       for p in llvm clang; do
@@ -284,28 +283,3 @@ if [[ "${windows_projects}" != "" ]]; then
   - 'bash .ci/monolithic-windows.sh "$(echo ${windows_projects} | tr ' ' ';')" "$(echo ${windows_check_targets})"'
 EOF
 fi
-
-# If build was triggered from a Phabricator review - send an update back.
-if [[ -n "${ph_target_phid:-}" ]]; then
-  cat << EOF
-- continue_on_failure: true
-  wait: '~'
-- label: ':phabricator: update build status on Phabricator'
-  agents: ${SERVICE_AGENTS}
-  artifact_paths:
-  - 'artifacts/**/*'
-  commands:
-  - export SRC=\$\${BUILDKITE_BUILD_PATH}/llvm-premerge-checks
-  - rm -rf \$\${SRC}
-  - git clone --depth 1 https://github.com/google/llvm-premerge-checks.git "\$\${SRC}"
-  - cd \$\${SRC}
-  - git fetch origin "main":x
-  - git checkout x
-  - echo "llvm-premerge-checks commit"
-  - git rev-parse HEAD
-  - pip install -q -r \$\${SRC}/scripts/requirements.txt
-  - cd "\$\$BUILDKITE_BUILD_CHECKOUT_PATH"
-  - \$\${SRC}/scripts/summary.py
-  timeout_in_minutes: 10
-EOF
-fi

.ci/generate-buildkite-pipeline-scheduled

@@ -45,7 +45,7 @@ cmake -S ${MONOREPO_ROOT}/llvm -B ${BUILD_DIR} \
       -D LLVM_ENABLE_ASSERTIONS=ON \
       -D LLVM_BUILD_EXAMPLES=ON \
       -D COMPILER_RT_BUILD_LIBFUZZER=OFF \
-      -D LLVM_LIT_ARGS="-v --xunit-xml-output ${BUILD_DIR}/test-results.xml" \
+      -D LLVM_LIT_ARGS="-v --xunit-xml-output ${BUILD_DIR}/test-results.xml --timeout=1200 --time-tests" \
       -D LLVM_ENABLE_LLD=ON \
       -D CMAKE_CXX_FLAGS=-gmlt \
       -D BOLT_CLANG_EXE=/usr/bin/clang \

.ci/monolithic-linux.sh

@@ -45,7 +45,7 @@ cmake -S ${MONOREPO_ROOT}/llvm -B ${BUILD_DIR} \
       -D LLVM_ENABLE_ASSERTIONS=ON \
       -D LLVM_BUILD_EXAMPLES=ON \
       -D COMPILER_RT_BUILD_LIBFUZZER=OFF \
-      -D LLVM_LIT_ARGS="-v --xunit-xml-output ${BUILD_DIR}/test-results.xml" \
+      -D LLVM_LIT_ARGS="-v --xunit-xml-output ${BUILD_DIR}/test-results.xml --timeout=1200 --time-tests" \
       -D COMPILER_RT_BUILD_ORC=OFF \
       -D CMAKE_C_COMPILER_LAUNCHER=sccache \
       -D CMAKE_CXX_COMPILER_LAUNCHER=sccache \

.ci/monolithic-windows.sh

@@ -70,3 +70,6 @@ f6d557ee34b6bbdb1dc32f29e34b4a4a8ad35e81
 
 # [libc++] Replace uses of _VSTD:: by std:: (#74331)
 77a00c0d546cd4aa8311b5b9031ae9ea8cdb050c
+
+# [libc++] Format the code base (#74334)
+9783f28cbb155e4a8d49c12e1c60ce14dcfaf0c7

.git-blame-ignore-revs

@@ -0,0 +1,142 @@
+libcxx/src/**/*.cpp     merge=libcxx-reformat
+libcxx/include/**/*.h   merge=libcxx-reformat
+
+# Explicitly handle files with no extension
+libcxx/include/__availability               merge=libcxx-reformat
+libcxx/include/__bit_reference              merge=libcxx-reformat
+libcxx/include/__config                     merge=libcxx-reformat
+libcxx/include/__hash_table                 merge=libcxx-reformat
+libcxx/include/__locale                     merge=libcxx-reformat
+libcxx/include/__node_handle                merge=libcxx-reformat
+libcxx/include/__split_buffer               merge=libcxx-reformat
+libcxx/include/__std_clang_module           merge=libcxx-reformat
+libcxx/include/__threading_support          merge=libcxx-reformat
+libcxx/include/__tree                       merge=libcxx-reformat
+libcxx/include/__verbose_abort              merge=libcxx-reformat
+libcxx/include/algorithm                    merge=libcxx-reformat
+libcxx/include/any                          merge=libcxx-reformat
+libcxx/include/array                        merge=libcxx-reformat
+libcxx/include/atomic                       merge=libcxx-reformat
+libcxx/include/barrier                      merge=libcxx-reformat
+libcxx/include/bit                          merge=libcxx-reformat
+libcxx/include/bitset                       merge=libcxx-reformat
+libcxx/include/cassert                      merge=libcxx-reformat
+libcxx/include/ccomplex                     merge=libcxx-reformat
+libcxx/include/cctype                       merge=libcxx-reformat
+libcxx/include/cerrno                       merge=libcxx-reformat
+libcxx/include/cfenv                        merge=libcxx-reformat
+libcxx/include/cfloat                       merge=libcxx-reformat
+libcxx/include/charconv                     merge=libcxx-reformat
+libcxx/include/chrono                       merge=libcxx-reformat
+libcxx/include/cinttypes                    merge=libcxx-reformat
+libcxx/include/ciso646                      merge=libcxx-reformat
+libcxx/include/climits                      merge=libcxx-reformat
+libcxx/include/clocale                      merge=libcxx-reformat
+libcxx/include/cmath                        merge=libcxx-reformat
+libcxx/include/codecvt                      merge=libcxx-reformat
+libcxx/include/compare                      merge=libcxx-reformat
+libcxx/include/complex                      merge=libcxx-reformat
+libcxx/include/concepts                     merge=libcxx-reformat
+libcxx/include/condition_variable           merge=libcxx-reformat
+libcxx/include/coroutine                    merge=libcxx-reformat
+libcxx/include/csetjmp                      merge=libcxx-reformat
+libcxx/include/csignal                      merge=libcxx-reformat
+libcxx/include/cstdarg                      merge=libcxx-reformat
+libcxx/include/cstdbool                     merge=libcxx-reformat
+libcxx/include/cstddef                      merge=libcxx-reformat
+libcxx/include/cstdint                      merge=libcxx-reformat
+libcxx/include/cstdio                       merge=libcxx-reformat
+libcxx/include/cstdlib                      merge=libcxx-reformat
+libcxx/include/cstring                      merge=libcxx-reformat
+libcxx/include/ctgmath                      merge=libcxx-reformat
+libcxx/include/ctime                        merge=libcxx-reformat
+libcxx/include/cuchar                       merge=libcxx-reformat
+libcxx/include/cwchar                       merge=libcxx-reformat
+libcxx/include/cwctype                      merge=libcxx-reformat
+libcxx/include/deque                        merge=libcxx-reformat
+libcxx/include/exception                    merge=libcxx-reformat
+libcxx/include/execution                    merge=libcxx-reformat
+libcxx/include/expected                     merge=libcxx-reformat
+libcxx/include/experimental/__config        merge=libcxx-reformat
+libcxx/include/experimental/__memory        merge=libcxx-reformat
+libcxx/include/experimental/deque           merge=libcxx-reformat
+libcxx/include/experimental/forward_list    merge=libcxx-reformat
+libcxx/include/experimental/iterator        merge=libcxx-reformat
+libcxx/include/experimental/list            merge=libcxx-reformat
+libcxx/include/experimental/map             merge=libcxx-reformat
+libcxx/include/experimental/memory          merge=libcxx-reformat
+libcxx/include/experimental/memory_resource merge=libcxx-reformat
+libcxx/include/experimental/propagate_const merge=libcxx-reformat
+libcxx/include/experimental/regex           merge=libcxx-reformat
+libcxx/include/experimental/set             merge=libcxx-reformat
+libcxx/include/experimental/simd            merge=libcxx-reformat
+libcxx/include/experimental/string          merge=libcxx-reformat
+libcxx/include/experimental/type_traits     merge=libcxx-reformat
+libcxx/include/experimental/unordered_map   merge=libcxx-reformat
+libcxx/include/experimental/unordered_set   merge=libcxx-reformat
+libcxx/include/experimental/utility         merge=libcxx-reformat
+libcxx/include/experimental/vector          merge=libcxx-reformat
+libcxx/include/ext/__hash                   merge=libcxx-reformat
+libcxx/include/ext/hash_map                 merge=libcxx-reformat
+libcxx/include/ext/hash_set                 merge=libcxx-reformat
+libcxx/include/filesystem                   merge=libcxx-reformat
+libcxx/include/format                       merge=libcxx-reformat
+libcxx/include/forward_list                 merge=libcxx-reformat
+libcxx/include/fstream                      merge=libcxx-reformat
+libcxx/include/functional                   merge=libcxx-reformat
+libcxx/include/future                       merge=libcxx-reformat
+libcxx/include/initializer_list             merge=libcxx-reformat
+libcxx/include/iomanip                      merge=libcxx-reformat
+libcxx/include/ios                          merge=libcxx-reformat
+libcxx/include/iosfwd                       merge=libcxx-reformat
+libcxx/include/iostream                     merge=libcxx-reformat
+libcxx/include/istream                      merge=libcxx-reformat
+libcxx/include/iterator                     merge=libcxx-reformat
+libcxx/include/latch                        merge=libcxx-reformat
+libcxx/include/limits                       merge=libcxx-reformat
+libcxx/include/list                         merge=libcxx-reformat
+libcxx/include/locale                       merge=libcxx-reformat
+libcxx/include/map                          merge=libcxx-reformat
+libcxx/include/mdspan                       merge=libcxx-reformat
+libcxx/include/memory                       merge=libcxx-reformat
+libcxx/include/memory_resource              merge=libcxx-reformat
+libcxx/include/mutex                        merge=libcxx-reformat
+libcxx/include/new                          merge=libcxx-reformat
+libcxx/include/numbers                      merge=libcxx-reformat
+libcxx/include/numeric                      merge=libcxx-reformat
+libcxx/include/optional                     merge=libcxx-reformat
+libcxx/include/ostream                      merge=libcxx-reformat
+libcxx/include/print                        merge=libcxx-reformat
+libcxx/include/queue                        merge=libcxx-reformat
+libcxx/include/random                       merge=libcxx-reformat
+libcxx/include/ranges                       merge=libcxx-reformat
+libcxx/include/ratio                        merge=libcxx-reformat
+libcxx/include/regex                        merge=libcxx-reformat
+libcxx/include/scoped_allocator             merge=libcxx-reformat
+libcxx/include/semaphore                    merge=libcxx-reformat
+libcxx/include/set                          merge=libcxx-reformat
+libcxx/include/shared_mutex                 merge=libcxx-reformat
+libcxx/include/source_location              merge=libcxx-reformat
+libcxx/include/span                         merge=libcxx-reformat
+libcxx/include/sstream                      merge=libcxx-reformat
+libcxx/include/stack                        merge=libcxx-reformat
+libcxx/include/stdexcept                    merge=libcxx-reformat
+libcxx/include/stop_token                   merge=libcxx-reformat
+libcxx/include/streambuf                    merge=libcxx-reformat
+libcxx/include/string                       merge=libcxx-reformat
+libcxx/include/string_view                  merge=libcxx-reformat
+libcxx/include/strstream                    merge=libcxx-reformat
+libcxx/include/syncstream                   merge=libcxx-reformat
+libcxx/include/system_error                 merge=libcxx-reformat
+libcxx/include/thread                       merge=libcxx-reformat
+libcxx/include/tuple                        merge=libcxx-reformat
+libcxx/include/type_traits                  merge=libcxx-reformat
+libcxx/include/typeindex                    merge=libcxx-reformat
+libcxx/include/typeinfo                     merge=libcxx-reformat
+libcxx/include/unordered_map                merge=libcxx-reformat
+libcxx/include/unordered_set                merge=libcxx-reformat
+libcxx/include/utility                      merge=libcxx-reformat
+libcxx/include/valarray                     merge=libcxx-reformat
+libcxx/include/variant                      merge=libcxx-reformat
+libcxx/include/vector                       merge=libcxx-reformat
+libcxx/include/version                      merge=libcxx-reformat