Revert "Reland "Roll clang+rust llvmorg-19-init-2941-ga0b3dbaf-22 : llvmorg-19-init-6501-g5b544b51-1 / 7168c13579a550f2c47f7eea22f5e226a436cd00-2 : b13a71a2e77f4625d1a2b8a5b9488414686ebca9-1""
This reverts commit 4791b0c21e25e932f29a25401ce5a26aea46f043.
Reason for revert: Failing a variety of tests on multiple msan
builders. (Determined via local bisect.) More details in
crbug.com/331926164.
Original change's description:
> Reland "Roll clang+rust llvmorg-19-init-2941-ga0b3dbaf-22 : llvmorg-19-init-6501-g5b544b51-1 / 7168c13579a550f2c47f7eea22f5e226a436cd00-2 : b13a71a2e77f4625d1a2b8a5b9488414686ebca9-1"
>
> This reverts commit 13dc9eae05d2638c112ff003c9b200824c990542.
>
> Reason for revert: retry win-arm64 bot
>
> Original change's description:
> > Revert "Roll clang+rust llvmorg-19-init-2941-ga0b3dbaf-22 : llvmorg-19-init-6501-g5b544b51-1 / 7168c13579a550f2c47f7eea22f5e226a436cd00-2 : b13a71a2e77f4625d1a2b8a5b9488414686ebca9-1"
> >
> > This reverts commit 1e35a7e3cf2c1dcb8be17715db59ed8fbaa85ac2.
> >
> > Reason for revert: may cause tree close: https://ci.chromium.org/ui/p/chromium/builders/ci/win-arm64-rel/729/overview.
> >
> > Original change's description:
> > > Roll clang+rust llvmorg-19-init-2941-ga0b3dbaf-22 : llvmorg-19-init-6501-g5b544b51-1 / 7168c13579a550f2c47f7eea22f5e226a436cd00-2 : b13a71a2e77f4625d1a2b8a5b9488414686ebca9-1
> > >
> > > Additionally, regenerate the abseil def files.
> > >
> > > https://chromium.googlesource.com/external/github.com/llvm/llvm-project/+log/a0b3dbaf..5b544b51
> > >
> > > https://chromium.googlesource.com/external/github.com/rust-lang/rust/+log/7168c13579a5..b13a71a2e77f
> > >
> > > Ran: ./tools/clang/scripts/upload_revision.py 5b544b511c7133fcb26a5c563b746a4baefb38d6
> > >
> > > Bug: 327446425
> > > 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: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: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: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
> > > Change-Id: Ifbb7a18cd24be9c620b958c154b13a2ad1b85b48
> > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5399878
> > > Commit-Queue: Nico Weber <thakis@chromium.org>
> > > Reviewed-by: Nico Weber <thakis@chromium.org>
> > > Cr-Commit-Position: refs/heads/main@{#1279833}
> >
> > Bug: 327446425
> > Change-Id: I62f969a45e5aa247ad608591ef8abca33e663445
> > 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: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: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: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
> > No-Presubmit: true
> > No-Tree-Checks: true
> > No-Try: true
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5403140
> > Commit-Queue: Xi Han <hanxi@chromium.org>
> > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
> > Auto-Submit: Xi Han <hanxi@chromium.org>
> > Owners-Override: Xi Han <hanxi@chromium.org>
> > Cr-Commit-Position: refs/heads/main@{#1279912}
>
> Bug: 327446425
> Change-Id: Ie6784b18dffe5aa90636daaddc6a05bd1c37c8e5
> Cq-Include-Trybots: chromium/try:win-arm64-rel
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5405904
> Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
> Reviewed-by: Nico Weber <thakis@chromium.org>
> Commit-Queue: Alan Zhao <ayzhao@google.com>
> Cr-Commit-Position: refs/heads/main@{#1280107}
Bug: 327446425
Change-Id: Iffbaa64065647319d4eb4117db8376af63471e17
Cq-Include-Trybots: chromium/try:win-arm64-rel
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5407433
Auto-Submit: thefrog <thefrog@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Owners-Override: thefrog <thefrog@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1280214}
NOKEYCHECK=True
GitOrigin-RevId: 0aff0a3e54ae39d0af289662059bd1be24bbbfae
diff --git a/update_rust.py b/update_rust.py
index deeeda6..e48ce04 100755
--- a/update_rust.py
+++ b/update_rust.py
@@ -34,8 +34,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 = 'b13a71a2e77f4625d1a2b8a5b9488414686ebca9'
-RUST_SUB_REVISION = 1 # Bumped to package and distribute `cargo-vet`
+RUST_REVISION = '7168c13579a550f2c47f7eea22f5e226a436cd00'
+RUST_SUB_REVISION = 2 # Bumped to package and distribute `cargo-vet`
# If not None, this overrides the `CLANG_REVISION` in
# //tools/clang/scripts/update.py in order to download a Rust toolchain that
@@ -56,7 +56,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 = '4c02260e8961a1ecd9823906a84dd8c663a22e5c91dd4647f0ea55c9109beccb'
+STAGE0_JSON_SHA256 = '5dd57024d78304079f2e5a6ea8900181c821a1bb394ed01cbfa80af7199ae5fa'
THIS_DIR = os.path.abspath(os.path.dirname(__file__))
CHROMIUM_DIR = os.path.abspath(os.path.join(THIS_DIR, '..', '..'))
