Roll clang+rust llvmorg-20-init-3847-g69c43468-28 : llvmorg-20-init-6794-g3dbd929e-1 / 009e73825af0e59ad4fc603562e038b3dbd6593a-23 : f5cd2c5888011d4d80311e5b771c6da507d860dd-2

https://chromium.googlesource.com/external/github.com/llvm/llvm-project/+log/69c43468..3dbd929e

https://chromium.googlesource.com/external/github.com/rust-lang/rust/+log/009e73825af0..f5cd2c588801

This includes a significant change to the Windows ASan runtime. Instead of
being linked statically into executables and DLLs, it now lives in
clang_rt.asan_dynamic-x86_64.dll, which means it's a new run-time dependency
for binaries that use it.

Bug: 365378961
Change-Id: Ibb0daf2c1edaf6de28024ae71fe989b903fe4870
Tricium: skip
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: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/+/5921462
Reviewed-by: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1368220}
NOKEYCHECK=True
GitOrigin-RevId: 85202d981e0c257f8f941e24b9baae38000d5019

Author: zmodem

build_rust.py

@@ -605,18 +605,6 @@ def GitApplyCherryPicks():
     # with `GitMoveSubmoduleBranch()`.
     #############################
 
-    # TODO Remove once LLVM rolls past llvmorg-20-init-3909-ge61d6066e267
-    RunCommand([
-        'git',
-        '-C',
-        RUST_SRC_DIR,
-        'revert',
-        '--no-edit',
-        '-m',
-        '1',
-        '8c7a7e346be4cdf13e77ab4acbfb5ade819a4e60',
-    ])
-
     # TODO(crbug.com/363219692): Remove once we roll past this revision.
     GitCherryPick(RUST_SRC_DIR, 'https://github.com/rust-lang/rust.git',
                   'edb669350a59ce48586152cf87b1d1f2841cea62')

update_rust.py

@@ -31,8 +31,8 @@
 
 # These fields are written by //tools/clang/scripts/upload_revision.py, and
 # should not be changed manually.
-RUST_REVISION = '009e73825af0e59ad4fc603562e038b3dbd6593a'
-RUST_SUB_REVISION = 23
+RUST_REVISION = 'f5cd2c5888011d4d80311e5b771c6da507d860dd'
+RUST_SUB_REVISION = 2
 
 # The revision of Crubit to use from https://github.com/google/crubit
 #
@@ -46,7 +46,7 @@
 # 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 = 'ed1bd5afab062116c6926ed9d3bbaa3ecdc037ff983f9dc34dbecece10ef91e0'
+STAGE0_JSON_SHA256 = '118891b1b25ce68a4bd792cd9640adaa8a4208d8d0684b458409cc8a86ded6aa'
 
 THIS_DIR = os.path.abspath(os.path.dirname(__file__))
 CHROMIUM_DIR = os.path.abspath(os.path.join(THIS_DIR, '..', '..'))