Start building with rustc on the Mac and Windows bots

We roll Rust from 6e0115778b0aedc90b59e035476c38e1b8c5c29b-2 to ac4379fea9e83465d814bb05005689f49bd2141e-1

And get Rust starting to build on Mac and Windows trybots. It doesn't
fully succeed but we can address more things in followup CLs.

Change-Id: Ia9822c8b24a5973e1ccef942944c3465075b119f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4310857
Reviewed-by: Collin Baker <[email protected]>
Commit-Queue: danakj <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1116627}
NOKEYCHECK=True
GitOrigin-RevId: 712cb486c1b2c53992fd329484c62e433df3945d

Author: danakj

build_rust.py

@@ -39,7 +39,6 @@
 import json
 import platform
 import os
-import pipes
 import shutil
 import string
 import subprocess
@@ -66,20 +65,21 @@
 
 EXCLUDED_TESTS = [
     # Temporarily disabled due to https://github.com/rust-lang/rust/issues/94322
-    'tests/ui/numeric/numeric-cast.rs',
+    os.path.join('tests', 'ui', 'numeric', 'numeric-cast.rs'),
     # Temporarily disabled due to https://github.com/rust-lang/rust/issues/96497
-    'tests/codegen/issue-96497-slice-size-nowrap.rs',
+    os.path.join('tests', 'codegen', 'issue-96497-slice-size-nowrap.rs'),
     # TODO(crbug.com/1347563): Re-enable when fixed.
-    'tests/codegen/sanitizer-cfi-emit-type-checks.rs',
-    'tests/codegen/sanitizer-cfi-emit-type-metadata-itanium-cxx-abi.rs',
+    os.path.join('tests', 'codegen', 'sanitizer-cfi-emit-type-checks.rs'),
+    os.path.join('tests', 'codegen',
+                 'sanitizer-cfi-emit-type-metadata-itanium-cxx-abi.rs'),
     # Temporarily disabled due to https://github.com/rust-lang/rust/issues/45222
     # which appears to have regressed as of a recent LLVM update. This test is
     # purely performance related, not correctness.
-    'tests/codegen/issue-45222.rs'
+    os.path.join('tests', 'codegen', 'issue-45222.rs')
 ]
 EXCLUDED_TESTS_WINDOWS = [
     # https://github.com/rust-lang/rust/issues/96464
-    'tests/codegen/vec-shrink-panik.rs'
+    os.path.join('tests', 'codegen', 'vec-shrink-panik.rs'),
 ]
 
 RUST_GIT_URL = ('https://chromium.googlesource.com/external/' +
@@ -313,28 +313,30 @@ def __init__(self, llvm_bins_path, zlib_path, libxml2_dirs, build_mac_arm,
             self._env['AR'] = os.path.join(llvm_bins_path, 'llvm-lib.exe')
             self._env['CC'] = os.path.join(llvm_bins_path, 'clang-cl.exe')
             self._env['CXX'] = os.path.join(llvm_bins_path, 'clang-cl.exe')
+            self._env['LD'] = os.path.join(llvm_bins_path, 'lld-link.exe')
         else:
             self._env['AR'] = os.path.join(llvm_bins_path, 'llvm-ar')
             self._env['CC'] = os.path.join(llvm_bins_path, 'clang')
             self._env['CXX'] = os.path.join(llvm_bins_path, 'clang++')
+            self._env['LD'] = os.path.join(llvm_bins_path, 'clang')
 
         if sys.platform == 'darwin':
             # The system/xcode compiler would find system SDK correctly, but
             # the Clang we've built does not. See
             # https://github.com/llvm/llvm-project/issues/45225
             sdk_path = subprocess.check_output(['xcrun', '--show-sdk-path'],
                                                text=True).rstrip()
-            RUSTENV['CFLAGS'] += f' -isysroot {sdk_path}'
-            RUSTENV['CXXFLAGS'] += f' -isysroot {sdk_path}'
-            RUSTENV['LDFLAGS'] += f' -isysroot {sdk_path}'
-            RUSTENV['RUSTFLAGS_BOOTSTRAP'] += (
+            self._env['CFLAGS'] += f' -isysroot {sdk_path}'
+            self._env['CXXFLAGS'] += f' -isysroot {sdk_path}'
+            self._env['LDFLAGS'] += f' -isysroot {sdk_path}'
+            self._env['RUSTFLAGS_BOOTSTRAP'] += (
                 f' -Clink-arg=-isysroot -Clink-arg={sdk_path}')
-            RUSTENV['RUSTFLAGS_NOT_BOOTSTRAP'] += (
+            self._env['RUSTFLAGS_NOT_BOOTSTRAP'] += (
                 f' -Clink-arg=-isysroot -Clink-arg={sdk_path}')
             # Rust compiletests don't get any of the RUSTFLAGS that we set here
             # and then the clang linker can't find `-lSystem`, unless we set the
             # `SDKROOT`.
-            RUSTENV['SDKROOT'] = sdk_path
+            self._env['SDKROOT'] = sdk_path
 
         if zlib_path:
             self._env['CFLAGS'] += f' -I{zlib_path}'
@@ -361,29 +363,39 @@ def __init__(self, llvm_bins_path, zlib_path, libxml2_dirs, build_mac_arm,
             self._env['CXXFLAGS'] += f' {gcc_toolchain_flag}'
             self._env['LDFLAGS'] += f' {gcc_toolchain_flag}'
             # A `-Clink-arg=<foo>` arg passes `foo`` to the linker invovation.
-            self._env[
-                'RUSTFLAGS_BOOTSTRAP'] += f' -Clink-arg={gcc_toolchain_flag}'
-            self._env[
-                'RUSTFLAGS_NOT_BOOTSTRAP'] += f' -Clink-arg={gcc_toolchain_flag}'
+            self._env['RUSTFLAGS_BOOTSTRAP'] += (
+                f' -Clink-arg={gcc_toolchain_flag}')
+            self._env['RUSTFLAGS_NOT_BOOTSTRAP'] += (
+                f' -Clink-arg={gcc_toolchain_flag}')
             self._env['RUSTFLAGS_BOOTSTRAP'] += (
                 f' -L native={gcc_toolchain_path}/lib64')
             self._env['RUSTFLAGS_NOT_BOOTSTRAP'] += (
                 f' -L native={gcc_toolchain_path}/lib64')
 
-        # Direct rustc to use Chromium's lld instead of the system linker. This
-        # is critical for stage 1 onward since we need to link libs with LLVM
-        # bitcode. It is also good for a hermetic build in general.
-        #
+        # TODO(danakj): On windows we point the to lld-link in config.toml so
+        # we don't (and can't) specify -fuse-ld=lld, as lld-link doesn't know
+        # that argument, and it's already using lld. Should we do the same for
+        # other platforms and remove this link argument?
+        if sys.platform != 'win32':
+            # Direct rustc to use Chromium's lld instead of the system linker.
+            # This is critical for stage 1 onward since we need to link libs
+            # with LLVM bitcode. It is also good for a hermetic build in
+            # general.
+            self._env['RUSTFLAGS_BOOTSTRAP'] += ' -Clink-arg=-fuse-ld=lld'
+            self._env['RUSTFLAGS_NOT_BOOTSTRAP'] += ' -Clink-arg=-fuse-ld=lld'
+
         # The `--undefined-version` flag is needed due to a bug in libtest:
-        # https://github.com/rust-lang/rust/issues/105967
-        self._env[
-            'RUSTFLAGS_BOOTSTRAP'] += ' -Clink-arg=-fuse-ld=lld -Clink-arg=-Wl,--undefined-version'
-        self._env[
-            'RUSTFLAGS_NOT_BOOTSTRAP'] += ' -Clink-arg=-fuse-ld=lld -Clink-arg=-Wl,--undefined-version'
+        # https://github.com/rust-lang/rust/issues/105967. The flag does
+        # not exist on Mac or Windows.
+        if sys.platform.startswith('linux'):
+            self._env['RUSTFLAGS_BOOTSTRAP'] += (
+                ' -Clink-arg=-Wl,--undefined-version')
+            self._env['RUSTFLAGS_NOT_BOOTSTRAP'] += (
+                ' -Clink-arg=-Wl,--undefined-version')
 
         # Rustdoc should use our clang linker as well, as we pass flags that
         # the system linker may not understand.
-        self._env['RUSTDOCFLAGS'] += f' -Clinker={self._env["CC"]}'
+        self._env['RUSTDOCFLAGS'] += f' -Clinker={self._env["LD"]}'
 
         # Cargo normally stores files in $HOME. Override this.
         self._env['CARGO_HOME'] = CARGO_HOME_DIR

config.toml.template

@@ -42,7 +42,7 @@ ranlib = "$LLVM_BIN/llvm-ranlib"
 ar = "$LLVM_BIN/llvm-lib"
 cc = "$LLVM_BIN/clang-cl"
 cxx = "$LLVM_BIN/clang-cl"
-# linker will be the system link.exe.
+linker = "$LLVM_BIN/lld-link"
 
 [target.arm64-apple-darwin]
 llvm-config = "$LLVM_LIB_ROOT/bin/llvm-config"
@@ -52,7 +52,7 @@ cc = "$LLVM_BIN/clang"
 cxx = "$LLVM_BIN/clang++"
 linker = "$LLVM_BIN/clang"
 
-[target.amd64-apple-darwin]
+[target.x86_64-apple-darwin]
 llvm-config = "$LLVM_LIB_ROOT/bin/llvm-config"
 ranlib = "$LLVM_BIN/llvm-ranlib"
 ar = "$LLVM_BIN/llvm-ar"

update_rust.py

@@ -29,8 +29,8 @@
 
 # These fields are written by //tools/clang/scripts/upload_revision.py, and
 # should not be changed manually.
-RUST_REVISION = '6e0115778b0aedc90b59e035476c38e1b8c5c29b'
-RUST_SUB_REVISION = 2
+RUST_REVISION = 'ac4379fea9e83465d814bb05005689f49bd2141e'
+RUST_SUB_REVISION = 1
 
 # Trunk on 2022-10-15.
 #
@@ -62,7 +62,7 @@
 # TODO(lukasza): Include CRUBIT_REVISION and CRUBIT_SUB_REVISION once we
 # include Crubit binaries in the generated package.  See also a TODO comment
 # in BuildCrubit in package_rust.py.
-FALLBACK_REVISION = '6e0115778b0aedc90b59e035476c38e1b8c5c29b-2-llvmorg-17-init-2387-g68e81d7e-1'
+FALLBACK_REVISION = 'ac4379fea9e83465d814bb05005689f49bd2141e-1-llvmorg-17-init-3874-g93a2fecc-1'
 
 # 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