chromium/src
0
Fork 0
Code Activity

Roll clang+rust llvmorg-19-init-9433-g76ea5feb-1 : llvmorg-19-init-10646-g084e2b53-1 / 31e6e8c6c5b6ce62656c922c7384d3376018c980-1 : 32dd3795bce8b347fda786529cf5e42a813e0b7d-1

Browse Source 
76ea5feb..084e2b53

31e6e8c6c5..32dd3795bc

Ran: ./tools/clang/scripts/upload_revision.py a99ce615f19fec6fbb835490b89f53cba3cf9eff

Ran: ./tools/rust/gnrt_stdlib.py

Bug: 338340745, 339499933
Binary-Size: see crbug.com/339499933
Change-Id: I082e9f126bf9dad279b7ec448c92cdb40193917d
Disable-Rts: True
Cq-Include-Trybots: chromium/try:chromeos-amd64-generic-cfi-thin-lto-rel
Cq-Include-Trybots: chromium/try:dawn-win10-x86-deps-rel
Cq-Include-Trybots: chromium/try:lacros-arm64-generic-rel
Cq-Include-Trybots: chromium/try:linux-chromeos-dbg
Cq-Include-Trybots: chromium/try:linux_chromium_cfi_rel_ng
Cq-Include-Trybots: chromium/try:linux_chromium_chromeos_msan_rel_ng
Cq-Include-Trybots: chromium/try:linux_chromium_msan_rel_ng
Cq-Include-Trybots: chromium/try:mac11-arm64-rel,mac_chromium_asan_rel_ng
Cq-Include-Trybots: chromium/try:ios-catalyst,win-asan,android-official
Cq-Include-Trybots: chromium/try:fuchsia-arm64-cast-receiver-rel
Cq-Include-Trybots: chromium/try:mac-official,linux-official
Cq-Include-Trybots: chromium/try:win-official,win32-official
Cq-Include-Trybots: chromium/try:win-arm64-rel
Cq-Include-Trybots: chromium/try:linux-swangle-try-x64,win-swangle-try-x86
Cq-Include-Trybots: chromium/try:android-cronet-mainline-clang-arm64-dbg
Cq-Include-Trybots: chromium/try:android-cronet-mainline-clang-arm64-rel
Cq-Include-Trybots: chromium/try:android-cronet-mainline-clang-x86-dbg
Cq-Include-Trybots: chromium/try:android-cronet-mainline-clang-x86-rel
Cq-Include-Trybots: chromium/try:android-cronet-riscv64-dbg
Cq-Include-Trybots: chromium/try:android-cronet-riscv64-rel
Cq-Include-Trybots: chrome/try:iphone-device,ipad-device
Cq-Include-Trybots: chrome/try:linux-chromeos-chrome
Cq-Include-Trybots: chrome/try:win-chrome,win64-chrome,linux-chrome,mac-chrome
Cq-Include-Trybots: chrome/try:linux-pgo,mac-pgo,win32-pgo,win64-pgo
Cq-Include-Trybots: chromium/try:android-rust-arm32-rel
Cq-Include-Trybots: chromium/try:android-rust-arm64-dbg
Cq-Include-Trybots: chromium/try:android-rust-arm64-rel
Cq-Include-Trybots: chromium/try:linux-rust-x64-dbg
Cq-Include-Trybots: chromium/try:linux-rust-x64-rel
Cq-Include-Trybots: chromium/try:mac-rust-x64-dbg
Cq-Include-Trybots: chromium/try:win-rust-x64-dbg
Cq-Include-Trybots: chromium/try:win-rust-x64-rel
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5522439
Reviewed-by: Zequan Wu <zequanwu@google.com>
Commit-Queue: Arthur Eubanks <aeubanks@google.com>
Cr-Commit-Position: refs/heads/main@{#1301364}
This commit is contained in:
Arthur Eubanks
2024-05-15 16:37:13 +00:00
committed by Chromium LUCI CQ
parent d0f2e2e872
commit 4a033e0362
3 changed files with 12 additions and 14 deletions
build/rust/std/rules
BUILD.gn
tools
clang
scripts
update.py
rust
update_rust.py

20
build/rust/std/rules/BUILD.gn

@ -2442,10 +2442,7 @@ cargo_crate("std") {
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys/pal/unix/thread.rs",
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys/pal/unix/thread_local_dtor.rs",
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys/pal/unix/thread_local_key.rs",
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys/pal/unix/thread_parking/darwin.rs",
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys/pal/unix/thread_parking/mod.rs",
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys/pal/unix/thread_parking/netbsd.rs",
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys/pal/unix/thread_parking/pthread.rs",
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys/pal/unix/thread_parking.rs",
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys/pal/unix/time.rs",
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys/pal/unix/weak.rs",
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys/pal/unsupported/alloc.rs",
@ -2463,7 +2460,6 @@ cargo_crate("std") {
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys/pal/unsupported/thread.rs",
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys/pal/unsupported/thread_local_dtor.rs",
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys/pal/unsupported/thread_local_key.rs",
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys/pal/unsupported/thread_parking.rs",
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys/pal/unsupported/time.rs",
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys/pal/wasi/args.rs",
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys/pal/wasi/env.rs",
@ -2515,7 +2511,6 @@ cargo_crate("std") {
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys/pal/windows/thread_local_dtor.rs",
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys/pal/windows/thread_local_key.rs",
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys/pal/windows/thread_local_key/tests.rs",
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys/pal/windows/thread_parking.rs",
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys/pal/windows/time.rs",
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys/pal/xous/alloc.rs",
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys/pal/xous/mod.rs",
@ -2528,7 +2523,6 @@ cargo_crate("std") {
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys/pal/xous/stdio.rs",
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys/pal/xous/thread.rs",
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys/pal/xous/thread_local_key.rs",
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys/pal/xous/thread_parking.rs",
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys/pal/xous/time.rs",
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys/pal/zkvm/abi.rs",
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys/pal/zkvm/alloc.rs",
@ -2579,6 +2573,14 @@ cargo_crate("std") {
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys/sync/rwlock/queue.rs",
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys/sync/rwlock/solid.rs",
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys/sync/rwlock/teeos.rs",
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys/sync/thread_parking/darwin.rs",
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys/sync/thread_parking/futex.rs",
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys/sync/thread_parking/id.rs",
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys/sync/thread_parking/mod.rs",
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys/sync/thread_parking/pthread.rs",
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys/sync/thread_parking/unsupported.rs",
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys/sync/thread_parking/windows.rs",
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys/sync/thread_parking/xous.rs",
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys/thread_local/fast_local.rs",
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys/thread_local/mod.rs",
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys/thread_local/os_local.rs",
@ -2595,9 +2597,6 @@ cargo_crate("std") {
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys_common/thread_local_dtor.rs",
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys_common/thread_local_key.rs",
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys_common/thread_local_key/tests.rs",
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys_common/thread_parking/futex.rs",
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys_common/thread_parking/id.rs",
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys_common/thread_parking/mod.rs",
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys_common/wstr.rs",
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys_common/wtf8.rs",
"//third_party/rust-toolchain/lib/rustlib/src/rust/library/std/src/sys_common/wtf8/tests.rs",
@ -2707,7 +2706,6 @@ cargo_crate("std") {
features = [
"addr2line",
"backtrace",
"gimli-symbolize",
"miniz_oxide",
"object",
"panic_unwind",

2
tools/clang/scripts/update.py

@ -36,7 +36,7 @@ import zlib
# https://chromium.googlesource.com/chromium/src/+/main/docs/updating_clang.md
# Reverting problematic clang rolls is safe, though.
# This is the output of `git describe` and is usable as a commit-ish.
CLANG_REVISION = 'llvmorg-19-init-9433-g76ea5feb'
CLANG_REVISION = 'llvmorg-19-init-10646-g084e2b53'
CLANG_SUB_REVISION = 1
PACKAGE_VERSION = '%s-%s' % (CLANG_REVISION, CLANG_SUB_REVISION)

4
tools/rust/update_rust.py

@ -35,7 +35,7 @@ sys.path.append(
# In the case that a Rust roll fails and you want to roll Clang alone, reset
# this back to its previous value _AND_ set `OVERRIDE_CLANG_REVISION` below
# to the `CLANG_REVISION` that was in place before the roll.
RUST_REVISION = '31e6e8c6c5b6ce62656c922c7384d3376018c980'
RUST_REVISION = '32dd3795bce8b347fda786529cf5e42a813e0b7d'
RUST_SUB_REVISION = 2
# If not None, this overrides the `CLANG_REVISION` in
@ -57,7 +57,7 @@ CRUBIT_SUB_REVISION = 1
# Hash of src/stage0.json, which itself contains the stage0 toolchain hashes.
# We trust the Rust build system checks, but to ensure it is not tampered with
# itself check the hash.
STAGE0_JSON_SHA256 = '4c02260e8961a1ecd9823906a84dd8c663a22e5c91dd4647f0ea55c9109beccb'
STAGE0_JSON_SHA256 = '803ce275a74899f722bc03ca12ecce03dfd937b71c9f2f3ff473ea80439ce596'
THIS_DIR = os.path.abspath(os.path.dirname(__file__))
CHROMIUM_DIR = os.path.abspath(os.path.join(THIS_DIR, '..', '..'))