Skip to content

Commit

Permalink
Roll clang+rust llvmorg-19-init-10646-g084e2b53-57 : llvmorg-19-init-…
Browse files Browse the repository at this point in the history
…14561-gecea8371-1 / 32dd3795bce8b347fda786529cf5e42a813e0b7d-2 : 3cf924b934322fd7b514600a7dc84fc517515346-1

https://chromium.googlesource.com/external/github.com/llvm/llvm-project/+log/084e2b53..ecea8371

https://chromium.googlesource.com/external/github.com/rust-lang/rust/+log/32dd3795bce8..3cf924b93432

Also update clang-cl flags to pass "/clang:-O2" after /O2
after  llvm/llvm-project#95406

Ran:
./tools/clang/scripts/upload_revision.py ecea8371ff03c15fb3dc27ee4108b98335fd2d63
tools/clang/scripts/sync_deps.py
tools/rust/gnrt_stdlib.py
third_party/abseil-cpp/generate_def_files.py

Bug: 340924169
Change-Id: Ie3680f33261952f66d972398656661090c47726a
Disable-Rts: True
Binary-Size: Inlining heuristic change, see crbug.com/347984812.
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/+/5633975
Reviewed-by: Nico Weber <[email protected]>
Commit-Queue: Hans Wennborg <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1317359}
  • Loading branch information
zmodem committed Jun 20, 2024
1 parent 4dab6da commit 65d491f
Show file tree
Hide file tree
Showing 11 changed files with 556 additions and 583 deletions.
192 changes: 96 additions & 96 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -801,143 +801,143 @@ deps = {
'condition': 'not llvm_force_head_revision',
'objects': [
{
'object_name': 'Linux_x64/clang-llvmorg-19-init-10646-g084e2b53-57.tar.xz',
'sha256sum': '2c95e921b2a26b968e5f2160560ed1f35559f5cc8a64a4f87974d51eff8eea8b',
'size_bytes': 50869256,
'generation': 1717767135920224,
'object_name': 'Linux_x64/clang-llvmorg-19-init-14561-gecea8371-1.tar.xz',
'sha256sum': '9b1bac96be0b06fd6e04cdf96dc07e7184e8612940ddf8bb507e184c16afd87f',
'size_bytes': 51499624,
'generation': 1718612840583170,
'condition': 'host_os == "linux" and non_git_source',
},
{
'object_name': 'Linux_x64/clang-tidy-llvmorg-19-init-10646-g084e2b53-57.tar.xz',
'sha256sum': '0ca2bb8311f1abcb80ba0d8c9a97c1375a5e14ff1c7920633d10cf3137fa272b',
'size_bytes': 12898000,
'generation': 1717767136015811,
'object_name': 'Linux_x64/clang-tidy-llvmorg-19-init-14561-gecea8371-1.tar.xz',
'sha256sum': '160a842bd85eaac34da6f7216992d180cb6820d94b9314c5be18a58aafec5a53',
'size_bytes': 13075072,
'generation': 1718612840771289,
'condition': 'host_os == "linux" and checkout_clang_tidy and non_git_source',
},
{
'object_name': 'Linux_x64/clangd-llvmorg-19-init-10646-g084e2b53-57.tar.xz',
'sha256sum': 'fc8daa9f864fcfb9797eebc008807d833dfcfcecb063bbb8931f36683358d8b2',
'size_bytes': 13303136,
'generation': 1717767135963516,
'object_name': 'Linux_x64/clangd-llvmorg-19-init-14561-gecea8371-1.tar.xz',
'sha256sum': 'd25fd75575750824a42e9d134dce286237b62951feff52f7c2196364f635bf46',
'size_bytes': 13540728,
'generation': 1718612840822054,
'condition': 'host_os == "linux" and checkout_clangd and non_git_source',
},
{
'object_name': 'Linux_x64/llvm-code-coverage-llvmorg-19-init-10646-g084e2b53-57.tar.xz',
'sha256sum': '253cb7766958664635b1ec9e25c60a9a9f5c919bb644249fcbc0316e01a38357',
'size_bytes': 2316576,
'generation': 1717767136054513,
'object_name': 'Linux_x64/llvm-code-coverage-llvmorg-19-init-14561-gecea8371-1.tar.xz',
'sha256sum': 'c792df3a77143c00a8725a55fe792914f4afaf5b447613b1627c2264a34108c7',
'size_bytes': 2355580,
'generation': 1718612841725212,
'condition': 'host_os == "linux" and checkout_clang_coverage_tools and non_git_source',
},
{
'object_name': 'Linux_x64/llvmobjdump-llvmorg-19-init-10646-g084e2b53-57.tar.xz',
'sha256sum': '8eb8aebc5b1bc237d552ef5e4dba701dbedfedd2e45f8cba4f4051c5727d34a5',
'size_bytes': 5345684,
'generation': 1717767135991162,
'object_name': 'Linux_x64/llvmobjdump-llvmorg-19-init-14561-gecea8371-1.tar.xz',
'sha256sum': '30616478e4b94d626b66ef1fa6bc2579fd82d88a013c877c70393e8199898b98',
'size_bytes': 5385320,
'generation': 1718612841266500,
'condition': '(checkout_linux or checkout_mac or checkout_android and host_os != "mac") and non_git_source',
},
{
'object_name': 'Mac/clang-llvmorg-19-init-10646-g084e2b53-57.tar.xz',
'sha256sum': '6e21ef43878368e499c009f6c383cebf318a109ed7c68a77017d1f898ac6ebd1',
'size_bytes': 45828024,
'generation': 1717767137856220,
'object_name': 'Mac/clang-llvmorg-19-init-14561-gecea8371-1.tar.xz',
'sha256sum': 'd2d237921be6243664608170aff3fb135cfc803281ba033123d6255ca1604424',
'size_bytes': 46442580,
'generation': 1718612843273440,
'condition': 'host_os == "mac" and host_cpu == "x64"',
},
{
'object_name': 'Mac/clang-mac-runtime-library-llvmorg-19-init-10646-g084e2b53-57.tar.xz',
'sha256sum': '70d8f252b65542c474f7b909767f70a6ca7e39396f0d8b2f9d3a74f065e0c241',
'size_bytes': 842840,
'generation': 1717767144188942,
'object_name': 'Mac/clang-mac-runtime-library-llvmorg-19-init-14561-gecea8371-1.tar.xz',
'sha256sum': '6013fda94e4de6f7606c0396632965a306cb7ea124e7dfd9db9892208e5d6793',
'size_bytes': 864076,
'generation': 1718612856108114,
'condition': 'checkout_mac and not host_os == "mac"',
},
{
'object_name': 'Mac/clang-tidy-llvmorg-19-init-10646-g084e2b53-57.tar.xz',
'sha256sum': 'ac1d4ccb3ca15e91966a5f64c223224c32936066d3df2c512682df688734ad07',
'size_bytes': 12493348,
'generation': 1717767137928722,
'object_name': 'Mac/clang-tidy-llvmorg-19-init-14561-gecea8371-1.tar.xz',
'sha256sum': 'e89a6d420c1b39903549629cefa95be7f637c36c07707f0d4632745b6566d077',
'size_bytes': 12645168,
'generation': 1718612843481513,
'condition': 'host_os == "mac" and host_cpu == "x64" and checkout_clang_tidy',
},
{
'object_name': 'Mac/clangd-llvmorg-19-init-10646-g084e2b53-57.tar.xz',
'sha256sum': '03428ee82481659ea1b4f60393cb0b83b56cf91d6da992a9ed28d9797752f6ca',
'size_bytes': 12784392,
'generation': 1717767137943240,
'object_name': 'Mac/clangd-llvmorg-19-init-14561-gecea8371-1.tar.xz',
'sha256sum': '11178628ffcc91b227aa66f0d4d4fa92d1268cd3d8a12f5c9d597dac55eaea58',
'size_bytes': 12966980,
'generation': 1718612843640107,
'condition': 'host_os == "mac" and host_cpu == "x64" and checkout_clangd',
},
{
'object_name': 'Mac/llvm-code-coverage-llvmorg-19-init-10646-g084e2b53-57.tar.xz',
'sha256sum': '307a36afe3aacba165a9dcfa362038029ac3f692bd18138062ad37f4ae482301',
'size_bytes': 2172676,
'generation': 1717767138031856,
'object_name': 'Mac/llvm-code-coverage-llvmorg-19-init-14561-gecea8371-1.tar.xz',
'sha256sum': '0e9f10bafe049c976bb2f588991ba4154c5805696e946c377c3ea02ce62b288a',
'size_bytes': 2236292,
'generation': 1718612844002512,
'condition': 'host_os == "mac" and host_cpu == "x64" and checkout_clang_coverage_tools',
},
{
'object_name': 'Mac_arm64/clang-llvmorg-19-init-10646-g084e2b53-57.tar.xz',
'sha256sum': '81cf4c48c346e7332cd83917d3f82660634d1123ab53fc93740f80fabd37de2e',
'size_bytes': 41487688,
'generation': 1717767147110695,
'object_name': 'Mac_arm64/clang-llvmorg-19-init-14561-gecea8371-1.tar.xz',
'sha256sum': '1fd706820978993faabf81fd49d906cce5d20a679345a704cf2edcf8d4961221',
'size_bytes': 42067252,
'generation': 1718612860537568,
'condition': 'host_os == "mac" and host_cpu == "arm64"',
},
{
'object_name': 'Mac_arm64/clang-tidy-llvmorg-19-init-10646-g084e2b53-57.tar.xz',
'sha256sum': '568cf47b9ec277adc4232e7171b6fe0665fa879bb1789343fbe0e8f5dab30d3b',
'size_bytes': 11456804,
'generation': 1717767147142997,
'object_name': 'Mac_arm64/clang-tidy-llvmorg-19-init-14561-gecea8371-1.tar.xz',
'sha256sum': '6f7f2341bcfc52f679e58b2ed8f8dfae28cb04cfc81daa2f3deed59e3b9c4920',
'size_bytes': 11609388,
'generation': 1718612860720279,
'condition': 'host_os == "mac" and host_cpu == "arm64" and checkout_clang_tidy',
},
{
'object_name': 'Mac_arm64/clangd-llvmorg-19-init-10646-g084e2b53-57.tar.xz',
'sha256sum': 'a53d7330161cb42aa8780a74615a888cacacb8ea9a6a449d8af74f2bff944f9b',
'size_bytes': 11912916,
'generation': 1717767147207329,
'object_name': 'Mac_arm64/clangd-llvmorg-19-init-14561-gecea8371-1.tar.xz',
'sha256sum': '66e73f4cfe9d6e262eaa03b4c3b6d3979a760758a467aae0b9d235ff5f229b5e',
'size_bytes': 12094612,
'generation': 1718612860853282,
'condition': 'host_os == "mac" and host_cpu == "arm64" and checkout_clangd',
},
{
'object_name': 'Mac_arm64/llvm-code-coverage-llvmorg-19-init-10646-g084e2b53-57.tar.xz',
'sha256sum': '9084ef3dd48711b2143369eca753e90fa5608fd66786ba3faae599a29a3b5a88',
'size_bytes': 1951880,
'generation': 1717767147282651,
'object_name': 'Mac_arm64/llvm-code-coverage-llvmorg-19-init-14561-gecea8371-1.tar.xz',
'sha256sum': 'c3d8ae400aa175af4f041d2c1be09bfd370071cec0a1dd0ea36fc84bbcc09722',
'size_bytes': 2004436,
'generation': 1718612861149498,
'condition': 'host_os == "mac" and host_cpu == "arm64" and checkout_clang_coverage_tools',
},
{
'object_name': 'Win/clang-llvmorg-19-init-10646-g084e2b53-57.tar.xz',
'sha256sum': '5b42a3e8f5847e9333263af5faa002ccd798893caf2ff47734a047e098bbb284',
'size_bytes': 40135748,
'generation': 1717767156694710,
'object_name': 'Win/clang-llvmorg-19-init-14561-gecea8371-1.tar.xz',
'sha256sum': 'edd36b71fdb914f003f84f9e87a23e695fe2431cc2720b0648cd7d24605b6718',
'size_bytes': 41781452,
'generation': 1718612878886786,
'condition': 'host_os == "win"',
},
{
'object_name': 'Win/clang-tidy-llvmorg-19-init-10646-g084e2b53-57.tar.xz',
'sha256sum': 'f8e08efb486f622b79129af2597caca9dba5033a8252f17fe2da64f021cc27cb',
'size_bytes': 12521172,
'generation': 1717767156756900,
'object_name': 'Win/clang-tidy-llvmorg-19-init-14561-gecea8371-1.tar.xz',
'sha256sum': '15f1a098d2026c63ed46448a4cfab2daea0030a66995e5d380715825120e6a5f',
'size_bytes': 12874576,
'generation': 1718612879087097,
'condition': 'host_os == "win" and checkout_clang_tidy',
},
{
'object_name': 'Win/clang-win-runtime-library-llvmorg-19-init-10646-g084e2b53-57.tar.xz',
'sha256sum': 'f8609347334a99b0363dd14d43b84d4db139630b43a8eefc8f8d4ec5b4b0fa49',
'size_bytes': 2804644,
'generation': 1717767164441105,
'object_name': 'Win/clang-win-runtime-library-llvmorg-19-init-14561-gecea8371-1.tar.xz',
'sha256sum': '952e09dabc9b2f09a5056e21086f05cad67992837967a96e20a5b64ca2d37568',
'size_bytes': 2841316,
'generation': 1718612894981280,
'condition': 'checkout_win and not host_os == "win"',
},
{
'object_name': 'Win/clangd-llvmorg-19-init-10646-g084e2b53-57.tar.xz',
'sha256sum': 'a52a5a9416b611bbc6248ce6a67d5f3d6937b4bfa55adc16e08cae3c69168f85',
'size_bytes': 12968240,
'generation': 1717767156753940,
'object_name': 'Win/clangd-llvmorg-19-init-14561-gecea8371-1.tar.xz',
'sha256sum': '921d249311125f257fe204e19741d57b6fcf88ce136eaa010560fce2f6f2204e',
'size_bytes': 13325100,
'generation': 1718612879252225,
'condition': 'host_os == "win" and checkout_clangd',
},
{
'object_name': 'Win/llvm-code-coverage-llvmorg-19-init-10646-g084e2b53-57.tar.xz',
'sha256sum': '34403d7c53bbdfd0c8ff5c10ce635754e80098b0e94942045e76284d6712d03a',
'size_bytes': 2291052,
'generation': 1717767156872540,
'object_name': 'Win/llvm-code-coverage-llvmorg-19-init-14561-gecea8371-1.tar.xz',
'sha256sum': '0034ec2988853d7767f421504feb1a0598565ba87dae03f95f3d752a885dec82',
'size_bytes': 2359388,
'generation': 1718612879559769,
'condition': 'host_os == "win" and checkout_clang_coverage_tools',
},
{
'object_name': 'Win/llvmobjdump-llvmorg-19-init-10646-g084e2b53-57.tar.xz',
'sha256sum': '1f8a52fdc4d051b30c6617d31a4737853b8c149e86f4082c55957210f68204a2',
'size_bytes': 5298192,
'generation': 1717767156826531,
'object_name': 'Win/llvmobjdump-llvmorg-19-init-14561-gecea8371-1.tar.xz',
'sha256sum': '0277d5708f40c8d6bb52ef6891cd09c65402680e8a6519fb008ce7e6bbab080d',
'size_bytes': 5363148,
'generation': 1718612879440086,
'condition': 'checkout_linux or checkout_mac or checkout_android and host_os == "win"',
},
]
Expand All @@ -948,31 +948,31 @@ deps = {
'bucket': 'chromium-browser-clang',
'objects': [
{
'object_name': 'Linux_x64/rust-toolchain-32dd3795bce8b347fda786529cf5e42a813e0b7d-2-llvmorg-19-init-10646-g084e2b53.tar.xz',
'sha256sum': 'e7e236fe6e61b7a41ba6b1e4bc64e91119359cdddce268597c6328b9fea8d76d',
'size_bytes': 151082700,
'generation': 1715715529295267,
'object_name': 'Linux_x64/rust-toolchain-3cf924b934322fd7b514600a7dc84fc517515346-1-llvmorg-19-init-14561-gecea8371.tar.xz',
'sha256sum': 'da968f038c46dc79d9b5bfb913db36f6dd6b5984f28d380d1e39e4027cacbdc2',
'size_bytes': 151179768,
'generation': 1718612834362475,
'condition': 'host_os == "linux" and non_git_source',
},
{
'object_name': 'Mac/rust-toolchain-32dd3795bce8b347fda786529cf5e42a813e0b7d-2-llvmorg-19-init-10646-g084e2b53.tar.xz',
'sha256sum': '3860d592e7f6a853aa06a00642f4110132c7af7f2b91d7bdd399d00dbd5177f6',
'size_bytes': 143827372,
'generation': 1715715530889094,
'object_name': 'Mac/rust-toolchain-3cf924b934322fd7b514600a7dc84fc517515346-1-llvmorg-19-init-14561-gecea8371.tar.xz',
'sha256sum': '96b5a66b459fe4725777b47b4f4abb95ab1507489048f67ddff320451183e68b',
'size_bytes': 143832584,
'generation': 1718612835881487,
'condition': 'host_os == "mac" and host_cpu == "x64"',
},
{
'object_name': 'Mac_arm64/rust-toolchain-32dd3795bce8b347fda786529cf5e42a813e0b7d-2-llvmorg-19-init-10646-g084e2b53.tar.xz',
'sha256sum': '333dfb93cb0d944acb1ed9f0c44aba9dfdb4e7cd2c660758014338bea37ce8da',
'size_bytes': 135183068,
'generation': 1715715532458630,
'object_name': 'Mac_arm64/rust-toolchain-3cf924b934322fd7b514600a7dc84fc517515346-1-llvmorg-19-init-14561-gecea8371.tar.xz',
'sha256sum': '50f3cf3adbfdd370c0ba1e55769b4fe8684e982269ec5dfd6e0192e3d87bc8f4',
'size_bytes': 135076956,
'generation': 1718612837238080,
'condition': 'host_os == "mac" and host_cpu == "arm64"',
},
{
'object_name': 'Win/rust-toolchain-32dd3795bce8b347fda786529cf5e42a813e0b7d-2-llvmorg-19-init-10646-g084e2b53.tar.xz',
'sha256sum': 'f610825518d0f3b6f1e9d2772065165b5bcac3302448a53ac89b3684bae7dbd2',
'size_bytes': 206423884,
'generation': 1715715534082072,
'object_name': 'Win/rust-toolchain-3cf924b934322fd7b514600a7dc84fc517515346-1-llvmorg-19-init-14561-gecea8371.tar.xz',
'sha256sum': '7304bb1e529e38ed88ec1e2fb20d1d35c9e54526e069d3d73645878ca3590ace',
'size_bytes': 206911624,
'generation': 1718612838776896,
'condition': 'host_os == "win"',
},
],
Expand Down
15 changes: 10 additions & 5 deletions build/config/compiler/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -1751,6 +1751,11 @@ config("treat_warnings_as_errors") {

# TODO(https://crbug.com/326247202): Fix unused imports and remove this flag.
rustflags += [ "-Aunused-imports" ]

if (is_chromeos) {
# TODO(crbug.com/347657114): Fix.
rustflags += [ "-Adead-code" ]
}
}

# default_warnings ------------------------------------------------------------
Expand Down Expand Up @@ -1928,10 +1933,8 @@ config("default_warnings") {
"-Wno-c++11-narrowing-const-reference",
]

if (llvm_force_head_revision) {
# TODO(crbug.com/344680447): Fix and re-enable.
cflags_cc += [ "-Wno-missing-template-arg-list-after-template-kw" ]
}
# TODO(crbug.com/344680447): Fix and re-enable.
cflags_cc += [ "-Wno-missing-template-arg-list-after-template-kw" ]
}
}

Expand Down Expand Up @@ -2435,7 +2438,9 @@ config("default_stack_frames") {
# [2]: https://crrev.com/c/5447532
config("optimize") {
if (is_win) {
cflags = [ "/O2" ] + common_optimize_on_cflags
# clang-cl's /O2 corresponds to clang's -O3, and really want -O2 for
# consistency with the other platforms.
cflags = [ "/O2", "/clang:-O2" ] + common_optimize_on_cflags

# The `-O3` for clang turns on extra optimizations compared to the standard
# `-O2`. But for rust, `-Copt-level=3` is the default and is thus reliable
Expand Down
2 changes: 1 addition & 1 deletion build/rust/std/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ if (toolchain_has_rust) {
"core",
"getopts",
"hashbrown",
"libc",
"panic_abort",
"panic_unwind",
"rustc_demangle",
Expand All @@ -67,6 +66,7 @@ if (toolchain_has_rust) {
"addr2line",
"adler",
"gimli",
"libc",
"memchr",
"miniz_oxide",
"object",
Expand Down
Loading

0 comments on commit 65d491f

Please sign in to comment.