Rust 1.89.0 upgrade

.github/workflows/ci.yml

@@ -19,6 +19,8 @@ on:
       - try
       - try-perf
       - automation/bors/try
+      - master
+      - solana-**
   pull_request:
     branches:
       - "**"
@@ -154,8 +156,8 @@ jobs:
           # which then uses log commands to actually set them.
           EXTRA_VARIABLES: ${{ toJson(matrix.env) }}
 
-      - name: ensure the channel matches the target branch
-        run: src/ci/scripts/verify-channel.sh
+#      - name: ensure the channel matches the target branch
+#        run: src/ci/scripts/verify-channel.sh
 
       - name: collect CPU statistics
         run: src/ci/scripts/collect-cpu-stats.sh
@@ -211,14 +213,14 @@ jobs:
       - name: disable git crlf conversion
         run: src/ci/scripts/disable-git-crlf-conversion.sh
 
-      - name: ensure line endings are correct
-        run: src/ci/scripts/verify-line-endings.sh
-
-      - name: ensure backported commits are in upstream branches
-        run: src/ci/scripts/verify-backported-commits.sh
+#      - name: ensure line endings are correct
+#        run: src/ci/scripts/verify-line-endings.sh
+#
+#      - name: ensure backported commits are in upstream branches
+#        run: src/ci/scripts/verify-backported-commits.sh
 
-      - name: ensure the stable version number is correct
-        run: src/ci/scripts/verify-stable-version-number.sh
+#      - name: ensure the stable version number is correct
+#        run: src/ci/scripts/verify-stable-version-number.sh
 
       # Show the environment just before we run the build
       # This makes it easier to diagnose problems with the above install scripts.
@@ -259,59 +261,6 @@ jobs:
           echo "disk usage:"
           df -h
 
-      - name: upload artifacts to github
-        uses: actions/upload-artifact@v4
-        with:
-          # name is set in previous step
-          name: ${{ env.DOC_ARTIFACT_NAME }}
-          path: obj/artifacts/doc
-          if-no-files-found: ignore
-          retention-days: 5
-
-      - name: upload artifacts to S3
-        run: src/ci/scripts/upload-artifacts.sh
-        env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.ARTIFACTS_AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.ARTIFACTS_AWS_SECRET_ACCESS_KEY }}
-        # Adding a condition on DEPLOY=1 or DEPLOY_ALT=1 is not needed as all deploy
-        # builders *should* have the AWS credentials available. Still, explicitly
-        # adding the condition is helpful as this way CI will not silently skip
-        # deploying artifacts from a dist builder if the variables are misconfigured,
-        # erroring about invalid credentials instead.
-        if: github.event_name == 'push' || env.DEPLOY == '1' || env.DEPLOY_ALT == '1'
-
-      - name: postprocess metrics into the summary
-        # This step is not critical, and if some I/O problem happens, we don't want
-        # to cancel the build.
-        continue-on-error: true
-        run: |
-          if [ -f build/metrics.json ]; then
-            METRICS=build/metrics.json
-          elif [ -f obj/build/metrics.json ]; then
-            METRICS=obj/build/metrics.json
-          else
-            echo "No metrics.json found"
-            exit 0
-          fi
-
-          # Get closest bors merge commit
-          PARENT_COMMIT=`git rev-list --author='bors <[email protected]>' -n1 --first-parent HEAD^1`
-
-          ./build/citool/debug/citool postprocess-metrics \
-              --job-name ${CI_JOB_NAME} \
-              --parent ${PARENT_COMMIT} \
-              ${METRICS} >> ${GITHUB_STEP_SUMMARY}
-
-      - name: upload job metrics to DataDog
-        # This step is not critical, and if some I/O problem happens, we don't want
-        # to cancel the build.
-        continue-on-error: true
-        if: needs.calculate_matrix.outputs.run_type != 'pr'
-        env:
-          DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }}
-          DD_GITHUB_JOB_NAME: ${{ matrix.full_name }}
-        run: ./build/citool/debug/citool upload-build-metrics build/cpu-usage.csv
-
   # This job isused to tell bors the final status of the build, as there is no practical way to detect
   # when a workflow is successful listening to webhooks only in our current bors implementation (homu).
   outcome:

.gitmodules

@@ -28,7 +28,7 @@
 	shallow = true
 [submodule "src/llvm-project"]
 	path = src/llvm-project
-	url = https://github.com/rust-lang/llvm-project.git
+	url = https://github.com/anza-xyz/llvm-project.git
 	branch = rustc/20.1-2025-02-13
 	shallow = true
 [submodule "src/doc/embedded-book"]

Cargo.lock

@@ -3144,14 +3144,14 @@ dependencies = [
 
 [[package]]
 name = "rustc-build-sysroot"
-version = "0.5.8"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16d115ad7e26e0d1337f64ae6598f758194696afc2e9f34c8a6f24582529c3dc"
+checksum = "3b881c015c729b43105bbd3702a9bdecee28fafaa21126d1d62e454ec011a4b7"
 dependencies = [
  "anyhow",
- "regex",
  "rustc_version",
  "tempfile",
+ "toml 0.8.23",
  "walkdir",
 ]
 
@@ -5396,7 +5396,20 @@ dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit",
+ "toml_edit 0.19.15",
+]
+
+[[package]]
+name = "toml"
+version = "0.8.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
+dependencies = [
+ "indexmap",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit 0.22.27",
 ]
 
 [[package]]
@@ -5421,6 +5434,26 @@ dependencies = [
  "winnow 0.5.40",
 ]
 
+[[package]]
+name = "toml_edit"
+version = "0.22.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
+dependencies = [
+ "indexmap",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_write",
+ "winnow 0.7.11",
+]
+
+[[package]]
+name = "toml_write"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
+
 [[package]]
 name = "tracing"
 version = "0.1.37"

README.md

@@ -1,3 +1,50 @@
+# Fork of the Rust Programming Language that supports Berkley Packet Filter (BPF) targets
+
+This fork of Rust contains changes that enable rustc to build BPF
+modules.  It depends on a customized
+[fork](https://github.com/anza-xyz/llvm-project) of Rust's LLVM
+fork.
+
+Solana SDK does not depend directly on this repo.  Instead [platform-tools]
+builds and releases binary packages that the Solana SDK pulls in.
+
+[platform-tools]: https://github.com/anza-xyz/platform-tools
+
+BPF modules are built using target triple `bpfel-unknown-unknown`
+which represents the little endian version of BPF.  There is no
+support for big endian at this time.
+
+Upgrading the compiler and standard library source tree
+-------------------------------------------------------
+
+The source tree has two external dependencies
+1. [compiler-builtins]
+2. [llvm-project]
+
+If any of the depencies is changed or this repository is updated to
+make a new release of the bpf-tools, tag the dependencies, and this
+repository with a new bpf-tools-v1.x tag, so that all components of
+the released bpf-tools have the same tag, e.g. bpf-tools-v1.6. Thus,
+release of every version of the bpf-tools is fully specified by the
+release version.
+
+The [llvm-project] is a submodule of this repository, therefore its
+version is explicitly committed in this repository.  However,
+[compiler-builtins] is pulled in as a cargo package.  Therefore, it is
+necessary to update the `[patch.crates-io]` subsection of the
+top-level `Cargo.toml` file, and specify which tag must be used to
+pull the correct version of [compiler-builtins].
+
+After this repository is tagged for a new release, update the
+`bpf-tools/build.sh` in [bpf-tools] repository to pull the correct
+version of the rust repository and make a new release tag in
+[bpf-tools] repository.
+
+[compiler-builtins]: https://github.com/anza-xyz/compiler-builtins
+[llvm-project]: https://github.com/anza-xyz/llvm-project
+
+---
+
 <div align="center">
   <picture>
     <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/rust-lang/www.rust-lang.org/master/static/images/rust-social-wide-dark.svg">

build.sh

@@ -0,0 +1,27 @@
+# SPDX-FileCopyrightText: 2025 Anza Technology Inc. <https://www.anza.xyz>
+#
+# SPDX-License-Identifier: MIT
+
+#!/usr/bin/env bash
+
+set -ex
+
+if [ "$1" == "--help" ] || [ "$1" == "-h" ]; then
+    echo "--llvm to rebuild llvm";
+    exit;
+fi
+
+unameOut="$(uname -s)-$(uname -m)"
+case "${unameOut}" in
+    Linux-x86_64*)  HOST_TRIPLE=x86_64-unknown-linux-gnu;;
+    Linux-aarch64*) HOST_TRIPLE=aarch64-unknown-linux-gnu;;
+    Darwin-x86_64*) HOST_TRIPLE=x86_64-apple-darwin;;
+    Darwin-arm64*)  HOST_TRIPLE=aarch64-apple-darwin;;
+    MINGW*)         HOST_TRIPLE=x86_64-pc-windows-msvc;;
+    *)              HOST_TRIPLE=x86_64-unknown-linux-gnu
+esac
+
+if [ "$1" == "--llvm" ]; then
+    rm -f build/${HOST_TRIPLE}/llvm/llvm-finished-building;
+fi
+./x.py build --stage 1 --target ${HOST_TRIPLE},sbf-solana-solana,sbpf-solana-solana,sbpfv1-solana-solana,sbpfv2-solana-solana,sbpfv3-solana-solana,sbpfv4-solana-solana

compiler/rustc_codegen_gcc/src/type_.rs

@@ -33,10 +33,6 @@ impl<'gcc, 'tcx> CodegenCx<'gcc, 'tcx> {
         }
     }
 
-    pub fn type_void(&self) -> Type<'gcc> {
-        self.context.new_type::<()>()
-    }
-
     pub fn type_size_t(&self) -> Type<'gcc> {
         self.context.new_type::<usize>()
     }
@@ -180,6 +176,10 @@ impl<'gcc, 'tcx> BaseTypeCodegenMethods for CodegenCx<'gcc, 'tcx> {
         bug!("unsupported float width 128")
     }
 
+    fn type_void(&self) -> Type<'gcc> {
+        self.context.new_type::<()>()
+    }
+
     fn type_func(&self, params: &[Type<'gcc>], return_type: Type<'gcc>) -> Type<'gcc> {
         self.context.new_function_pointer_type(None, return_type, params, false)
     }

compiler/rustc_codegen_llvm/src/context.rs

@@ -864,7 +864,7 @@ impl<'ll> CodegenCx<'ll, '_> {
         // and we use it to implement intrinsics like `raw_eq` and `compare_bytes`
         if base_name == "memcmp" {
             let fn_ty = self
-                .type_func(&[self.type_ptr(), self.type_ptr(), self.type_isize()], self.type_int());
+                .type_func(&[self.type_ptr(), self.type_ptr(), self.type_isize()], self.type_i32());
             let f = self.declare_cfn("memcmp", llvm::UnnamedAddr::No, fn_ty);
 
             return (fn_ty, f);

compiler/rustc_codegen_llvm/src/intrinsic.rs

@@ -472,7 +472,7 @@ impl<'ll, 'tcx> IntrinsicCallBuilderMethods<'tcx> for Builder<'_, 'll, 'tcx> {
                 } else {
                     let n = self.const_usize(layout.size().bytes());
                     let cmp = self.call_intrinsic("memcmp", &[], &[a, b, n]);
-                    self.icmp(IntPredicate::IntEQ, cmp, self.const_int(self.type_int(), 0))
+                    self.icmp(IntPredicate::IntEQ, cmp, self.const_int(self.type_i32(), 0))
                 }
             }
 

compiler/rustc_codegen_llvm/src/type_.rs

@@ -199,6 +199,10 @@ impl<'ll, CX: Borrow<SCx<'ll>>> BaseTypeCodegenMethods for GenericCx<'ll, CX> {
         unsafe { llvm::LLVMFP128TypeInContext(self.llcx()) }
     }
 
+    fn type_void(&self) -> &'ll Type {
+        unsafe { llvm::LLVMVoidTypeInContext(self.llcx()) }
+    }
+
     fn type_func(&self, args: &[&'ll Type], ret: &'ll Type) -> &'ll Type {
         unsafe { llvm::LLVMFunctionType(ret, args.as_ptr(), args.len() as c_uint, False) }
     }

compiler/rustc_codegen_ssa/src/back/link.rs

@@ -1863,17 +1863,23 @@ fn add_pre_link_args(cmd: &mut dyn Linker, sess: &Session, flavor: LinkerFlavor)
     cmd.verbatim_args(&sess.opts.unstable_opts.pre_link_args);
 }
 
-/// Add a link script embedded in the target, if applicable.
+/// Add a link script embedded in the target, if applicable and not found in the command line.
 fn add_link_script(cmd: &mut dyn Linker, sess: &Session, tmpdir: &Path, crate_type: CrateType) {
     match (crate_type, &sess.target.link_script) {
         (CrateType::Cdylib | CrateType::Executable, Some(script)) => {
             if !sess.target.linker_flavor.is_gnu() {
                 sess.dcx().emit_fatal(errors::LinkScriptUnavailable);
             }
 
+            if sess.opts.cg.link_args.contains(&String::from("--script"))
+                || sess.opts.cg.link_args.contains(&String::from("-T")) {
+                return;
+            }
+
             let file_name = ["rustc", &sess.target.llvm_target, "linkfile.ld"].join("-");
 
             let path = tmpdir.join(file_name);
+
             if let Err(error) = fs::write(&path, script.as_ref()) {
                 sess.dcx().emit_fatal(errors::LinkScriptWriteFailure { path, error });
             }

compiler/rustc_codegen_ssa/src/back/linker.rs

@@ -466,6 +466,23 @@ impl<'a> GccLinker<'a> {
                     self.link_arg(soname);
                 }
             }
+
+            if self.sess.target.arch == "bpf" || self.sess.target.arch == "sbf" {
+                if self.sess.opts.test {
+                    self.link_arg("--entry=main");
+                } else {
+                    self.link_arg("--entry=entrypoint");
+                }
+
+                let cpu_type = self.sess.opts.cg.target_cpu.as_ref().cloned()
+                    .unwrap_or(self.sess.target.cpu.as_ref().to_string());
+                if cpu_type == "v3" || cpu_type == "v4" {
+                    self.link_arg("-Bsymbolic");
+                    if self.sess.opts.debuginfo == DebugInfo::None {
+                        self.link_arg("--strip-all");
+                    }
+                }
+            }
         }
     }
 

compiler/rustc_codegen_ssa/src/base.rs

@@ -581,6 +581,7 @@ pub fn maybe_create_entry_wrapper<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>>(
         };
 
         let result = bx.call(start_ty, None, None, start_fn, &args, None, instance);
+
         if cx.sess().target.os.contains("uefi") {
             bx.ret(result);
         } else {

compiler/rustc_codegen_ssa/src/traits/type_.rs

@@ -23,6 +23,8 @@ pub trait BaseTypeCodegenMethods: BackendTypes {
     fn type_f128(&self) -> Self::Type;
 
     fn type_array(&self, ty: Self::Type, len: u64) -> Self::Type;
+    fn type_void(&self) -> Self::Type;
+
     fn type_func(&self, args: &[Self::Type], ret: Self::Type) -> Self::Type;
     fn type_kind(&self, ty: Self::Type) -> TypeKind;
     fn type_ptr(&self) -> Self::Type;

compiler/rustc_feature/src/unstable.rs

@@ -334,6 +334,7 @@ declare_features! (
     (unstable, riscv_target_feature, "1.45.0", Some(44839)),
     (unstable, rtm_target_feature, "1.35.0", Some(44839)),
     (unstable, s390x_target_feature, "1.82.0", Some(44839)),
+    (unstable, sbf_target_feature, "1.54.0", Some(44839)),
     (unstable, sparc_target_feature, "1.84.0", Some(132783)),
     (unstable, sse4a_target_feature, "1.27.0", Some(44839)),
     (unstable, tbm_target_feature, "1.27.0", Some(44839)),

compiler/rustc_llvm/build.rs

@@ -25,6 +25,7 @@ const OPTIONAL_COMPONENTS: &[&str] = &[
     "riscv",
     "xtensa",
     "bpf",
+    "sbf",
 ];
 
 const REQUIRED_COMPONENTS: &[&str] =