Skip to content

Commit da4978b

Browse files
alanzhao1copybara-github
authored andcommitted
Roll clang+rust llvmorg-22-init-6852-g2384a6a2-4 : llvmorg-22-init-8940-g4d4cb757-1 / 99317ef14d0be42fa4039eea7c5ce50cb4e9aee7-4 : 15283f6fe95e5b604273d13a428bab5fc0788f5a-1
https://chromium.googlesource.com/external/github.com/llvm/llvm-project/+log/2384a6a2..4d4cb757 https://chromium.googlesource.com/external/github.com/rust-lang/rust/+log/99317ef14d0b..15283f6fe95e Ran: ./tools/clang/scripts/upload_revision.py 4d4cb757f94470b95458fcbe3b88332b212feeee Also: * ran gnrt_stdlib.py * use immediate-abort for official builds for *all* crates (instead of just the stdlib) to deal with rust-lang/rust#146317. Bug: 444224976,447200172 Disable-Rts: True Cq-Include-Trybots: chromium/try:android-cronet-riscv64-dbg Cq-Include-Trybots: chromium/try:android-cronet-riscv64-rel 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:fuchsia-arm64-cast-receiver-rel Cq-Include-Trybots: chromium/try:ios-catalyst,win-asan,android-official Cq-Include-Trybots: chromium/try:linux-cast-x64-rel Cq-Include-Trybots: chromium/try:linux-chromeos-dbg Cq-Include-Trybots: chromium/try:linux-swangle-try-x64,win-swangle-try-x86 Cq-Include-Trybots: chromium/try:linux-v4l2-codec-rel Cq-Include-Trybots: chromium/try:linux-wayland-mutter-rel Cq-Include-Trybots: chromium/try:linux_chromium_cfi_rel_ng Cq-Include-Trybots: chromium/try:linux_chromium_msan_rel_ng Cq-Include-Trybots: chromium/try:mac-official,linux-official Cq-Include-Trybots: chromium/try:mac12-arm64-rel,mac_chromium_asan_rel_ng Cq-Include-Trybots: chromium/try:win-arm64-rel Cq-Include-Trybots: chromium/try:win-official,win32-official Cq-Include-Trybots: chrome/try:android-arm32-pgo,android-arm64-pgo Cq-Include-Trybots: chrome/try:android-x64-rel-ready Cq-Include-Trybots: chrome/try:chromeos-brya-chrome,chromeos-eve-chrome Cq-Include-Trybots: chrome/try:chromeos-volteer-chrome Cq-Include-Trybots: chrome/try:iphone-device Cq-Include-Trybots: chrome/try:linux-chromeos-chrome Cq-Include-Trybots: chrome/try:linux-pgo,mac-pgo,win32-pgo,win64-pgo Cq-Include-Trybots: chrome/try:win-chrome,win64-chrome,linux-chrome,mac-chrome 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: I078392e5e8cd86b791906fc47aebafed25527097 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6980648 Commit-Queue: Nico Weber <[email protected]> Reviewed-by: Nico Weber <[email protected]> Auto-Submit: Alan Zhao <[email protected]> Cr-Commit-Position: refs/heads/main@{#1520848} NOKEYCHECK=True GitOrigin-RevId: 03ecd7d4ec31f8f07a659cbb19baf662012a1c8d
1 parent 369e98b commit da4978b

File tree

3 files changed

+53
-95
lines changed

3 files changed

+53
-95
lines changed

config/compiler/BUILD.gn

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1165,10 +1165,18 @@ config("compiler") {
11651165
# abort instead of unwinding when panic occurs. In official builds, panics
11661166
# abort immediately (this is configured in the stdlib) to keep binary size
11671167
# down. So we unconditionally match behaviour in unofficial too.
1168-
rustflags += [
1169-
"-Cpanic=abort",
1170-
"-Zpanic_abort_tests",
1171-
]
1168+
if (is_official_build) {
1169+
rustflags += [
1170+
"-Zunstable-options",
1171+
"-Cpanic=immediate-abort",
1172+
"-Zpanic_abort_tests",
1173+
]
1174+
} else {
1175+
rustflags += [
1176+
"-Cpanic=abort",
1177+
"-Zpanic_abort_tests",
1178+
]
1179+
}
11721180
}
11731181

11741182
# crbug.com/397463803: Set this until CrOS' user enumeration is done; its

rust/BUILD.gn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ config("panic_immediate_abort") {
9595
visibility = [ "//build/rust/std/rules:*" ]
9696
if (is_official_build) {
9797
rustflags = [
98-
"--cfg",
99-
"feature=\"panic_immediate_abort\"",
98+
"-Zunstable-options",
99+
"-Cpanic=immediate-abort",
100100
]
101101
}
102102
}

0 commit comments

Comments
 (0)