Roll clang+rust llvmorg-19-init-14561-gecea8371-3000 : llvmorg-20-init-826-gc95abe94-3 / 3cf924b934322fd7b514600a7dc84fc517515346-4 : 595316b4006932405a63862d8fe65f71a6356293-3
https://chromium.googlesource.com/external/github.com/llvm/llvm-project/+log/ecea8371..c95abe94
https://chromium.googlesource.com/external/github.com/rust-lang/rust/+log/3cf924b93432..595316b40069
Ran: ./tools/clang/scripts/upload_revision.py c95abe94aebb6862c3518e590343df3b7376ccee
Ran: tools/clang/scripts/sync_deps.py
Ran: tools/rust/gnrt_stdlib.py
Due to https://crbug.com/357125724, revert https://github.com/rust-lang/rust/pull/125016 for now.
Bug: 348666967, 350341587, 355031922, 356172342, 357125724
Change-Id: I7953b33e8619c145105029f4adc30a0e767b5123
Binary-Size: Compiler update variation
Fuchsia-Binary-Size: Compiler update variation
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-riscv64-dbg
Cq-Include-Trybots: chromium/try:android-cronet-mainline-clang-riscv64-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/+/5753956
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1337246}
NOKEYCHECK=True
GitOrigin-RevId: 546d096fdb2c93d74034005ff73ecd5ee6af2d23
diff --git a/build_rust.py b/build_rust.py
index 3614d52..1fece42 100755
--- a/build_rust.py
+++ b/build_rust.py
@@ -619,6 +619,24 @@
GitCherryPick(RUST_SRC_DIR, 'https://github.com/rust-lang/rust.git',
'14947b410ad23a09251180af50486e247f70b465')
+ # TODO(crbug.com/350341587): Remove once
+ # https://github.com/rust-lang/rust/pull/127025 or a similar fix has been
+ # merged.
+ GitCherryPick(RUST_SRC_DIR, 'https://github.com/rust-lang/rust.git',
+ '56d589b5bea75d08d21d7d6efb34e8527aec7635')
+
+ # TODO(https://crbug.com/357125724): Remove once compiler_builtins is fixed
+ RunCommand([
+ 'git',
+ '-C',
+ RUST_SRC_DIR,
+ 'revert',
+ '--no-edit',
+ '-m',
+ '1',
+ '80d8270d8488957f62fbf0df7a19dfe596be92ac',
+ ])
+
print('Finished applying cherry-picks.')
diff --git a/update_rust.py b/update_rust.py
index 716e9b2..38167cb 100755
--- a/update_rust.py
+++ b/update_rust.py
@@ -35,8 +35,8 @@
# 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 = '3cf924b934322fd7b514600a7dc84fc517515346'
-RUST_SUB_REVISION = 4
+RUST_REVISION = '595316b4006932405a63862d8fe65f71a6356293'
+RUST_SUB_REVISION = 3
# If not None, this overrides the `CLANG_REVISION` in
# //tools/clang/scripts/update.py in order to download a Rust toolchain that
