Skip to content

Commit

Permalink
Roll clang+rust llvmorg-19-init-14561-gecea8371-3000 : llvmorg-20-ini…
Browse files Browse the repository at this point in the history
…t-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 rust-lang/rust#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
  • Loading branch information
aeubanks authored and copybara-github committed Aug 5, 2024
1 parent b3ab9cf commit a2631a7
Show file tree
Hide file tree
Showing 5 changed files with 164 additions and 138 deletions.
8 changes: 3 additions & 5 deletions config/compiler/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -1961,10 +1961,8 @@ config("default_warnings") {
# TODO(crbug.com/344680447): Fix and re-enable.
cflags_cc += [ "-Wno-missing-template-arg-list-after-template-kw" ]

if (llvm_force_head_revision) {
# TODO(crbug.com/356172342): Fix and re-enable.
cflags_cc += [ "-Wno-dangling-assignment-gsl" ]
}
# TODO(crbug.com/356172342): Fix and re-enable.
cflags_cc += [ "-Wno-dangling-assignment-gsl" ]
}
}

Expand All @@ -1981,7 +1979,7 @@ config("default_warnings") {
}

# TODO(crbug.com/354162568): Clean up and enable.
if (llvm_force_head_revision && is_apple && use_lld) {
if (is_apple && use_lld) {
ldflags += [ "-Wl,--no-warn-duplicate-rpath" ]
}

Expand Down
13 changes: 13 additions & 0 deletions rust/cargo_crate.gni
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,19 @@ template("cargo_crate") {
rust_abi_target,
]
}
if (current_cpu == "arm64" || current_cpu == "x64") {
args += [
"--pointer-width",
"64",
]
} else if (current_cpu == "arm" || current_cpu == "x86") {
args += [
"--pointer-width",
"32",
]
} else {
assert(false, "Architecture not supported")
}
if (defined(invoker.features)) {
args += [ "--features" ]
args += invoker.features
Expand Down
3 changes: 3 additions & 0 deletions rust/run_build_script.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ def main():
required=True,
help='where to write output rustc flags')
parser.add_argument('--target', help='rust target triple')
parser.add_argument('--pointer-width', help='rust target pointer width')
parser.add_argument('--features', help='features', nargs='+')
parser.add_argument('--env', help='environment variable', nargs='+')
parser.add_argument('--rust-prefix', required=True, help='rust path prefix')
Expand Down Expand Up @@ -103,6 +104,7 @@ def main():
env["OUT_DIR"] = tempdir
env["CARGO_MANIFEST_DIR"] = os.path.abspath(args.src_dir)
env["HOST"] = host_triple(rustc_path)
env["CARGO_CFG_TARGET_POINTER_WIDTH"] = args.pointer_width
if args.target is None:
env["TARGET"] = env["HOST"]
else:
Expand Down Expand Up @@ -132,6 +134,7 @@ def main():
env["CARGO_CFG_TARGET_OS"] = "android"
elif env["CARGO_CFG_TARGET_OS"] == "darwin":
env["CARGO_CFG_TARGET_OS"] = "macos"
env["CARGO_CFG_TARGET_POINTER_WIDTH"] = args.pointer_width
if args.features:
for f in args.features:
feature_name = f.upper().replace("-", "_")
Expand Down
Loading

0 comments on commit a2631a7

Please sign in to comment.