[SOL] Fixes after Rust 1.84.1 upgrade

Author: LucasSte

.github/workflows/ci.yml

@@ -79,6 +79,8 @@ jobs:
     continue-on-error: ${{ matrix.continue_on_error || false }}
     strategy:
       matrix:
+        # Check the `calculate_matrix` job to see how is the matrix defined.
+        include: ${{ fromJSON(needs.calculate_matrix.outputs.jobs) }}
     steps:
       - if: contains(matrix.os, 'windows')
         uses: msys2/[email protected]
@@ -130,8 +132,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
@@ -180,14 +182,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
 
       - name: run the build
         # Redirect stderr to stdout to avoid reordering the two streams in the GHA logs.
@@ -204,45 +206,14 @@ 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: ${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}
-        # 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: upload job metrics to DataDog
-        if: needs.calculate_matrix.outputs.run_type != 'pr'
-        env:
-          DATADOG_SITE: datadoghq.com
-          DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }}
-          DD_GITHUB_JOB_NAME: ${{ matrix.name }}
-        run: |
-          npm install -g @datadog/datadog-ci@^2.x.x
-          python3 src/ci/scripts/upload-build-metrics.py 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:
     name: bors build finished
     runs-on: ubuntu-latest
     needs: [ calculate_matrix, job ]
     # !cancelled() executes the job regardless of whether the previous jobs passed or failed
-    if: ${{ !cancelled() && contains(fromJSON('["auto", "try"]'), needs.calculate_matrix.outputs.run_type) }
+    if: ${{ !cancelled() && contains(fromJSON('["auto", "try"]'), needs.calculate_matrix.outputs.run_type) }}
     steps:
       - name: checkout the source code
         uses: actions/checkout@v4

Cargo.lock

@@ -1434,7 +1434,7 @@ checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasi",
 ]
 
 [[package]]
@@ -2284,7 +2284,7 @@ dependencies = [
  "colored",
  "ctrlc",
  "directories",
- "getrandom 0.2.13",
+ "getrandom",
  "jemalloc-sys",
  "libc",
  "libffi",
@@ -2925,7 +2925,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.13",
+ "getrandom",
 ]
 
 [[package]]
@@ -2972,7 +2972,7 @@ version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
 dependencies = [
- "getrandom 0.2.13",
+ "getrandom",
  "libredox",
  "thiserror",
 ]
@@ -3117,9 +3117,8 @@ dependencies = [
 
 [[package]]
 name = "rustc-build-sysroot"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6d984a9db43148467059309bd1e5ad577085162f695d9fe2cf3543aeb25cd38"
+version = "0.5.3"
+source = "git+https://github.com/anza-xyz/rustc-build-sysroot?tag=solana-tools-v1.47#0d6d7ae18aaecf45f0a6e87bcf83b2293263f5bd"
 dependencies = [
  "anyhow",
  "rustc_version",
@@ -5701,7 +5700,7 @@ version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a"
 dependencies = [
- "getrandom 0.2.13",
+ "getrandom",
 ]
 
 [[package]]
@@ -5732,12 +5731,6 @@ dependencies = [
  "winapi-util",
 ]
 
-[[package]]
-name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-
 [[package]]
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"

build.sh

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2025 Anza Technology Inc. <https://www.anza.xyz>
+#
+# SPDX-License-Identifier: MIT
+
 #!/usr/bin/env bash
 
 set -ex

compiler/rustc_codegen_gcc/build_system/build_sysroot/Cargo.toml

@@ -6,7 +6,7 @@ resolver = "2"
 
 [dependencies]
 core = { path = "./sysroot_src/library/core" }
-compiler_builtins = "0.1"
+compiler_builtins = { git = "https://github.com/anza-xyz/compiler-builtins", tag = "solana-tools-v1.47" }
 alloc = { path = "./sysroot_src/library/alloc" }
 std = { path = "./sysroot_src/library/std", features = ["panic_unwind", "backtrace"] }
 test = { path = "./sysroot_src/library/test" }

compiler/rustc_codegen_llvm/src/allocator.rs

@@ -86,9 +86,7 @@ pub(crate) unsafe fn codegen(
         if tcx.sess.target.arch != "sbf" {
             let name = NO_ALLOC_SHIM_IS_UNSTABLE;
             let ll_g = llvm::LLVMRustGetOrInsertGlobal(llmod, name.as_ptr().cast(), name.len(), i8);
-            if tcx.sess.default_hidden_visibility() {
-                llvm::LLVMRustSetVisibility(ll_g, llvm::Visibility::Hidden);
-            }
+            llvm::set_visibility(ll_g, llvm::Visibility::from_generic(tcx.sess.default_visibility()));
             let llval = llvm::LLVMConstInt(i8, 0, False);
             llvm::LLVMSetInitializer(ll_g, llval);
         }

compiler/rustc_codegen_ssa/src/back/linker.rs

@@ -443,17 +443,19 @@ impl<'a> GccLinker<'a> {
                     soname.push(name);
                     self.link_arg(soname);
                 }
-            } else if self.sess.target.arch == "bpf" || self.sess.target.arch == "sbf" {
+            }
+
+            if self.sess.target.arch == "bpf" || self.sess.target.arch == "sbf" {
                 if self.sess.opts.test {
-                    self.linker_arg("--entry=main");
+                    self.link_arg("--entry=main");
                 } else {
-                    self.linker_arg("--entry=entrypoint");
+                    self.link_arg("--entry=entrypoint");
                 }
                 if self.sess.opts.cg.target_cpu.as_ref()
                     .unwrap_or(&self.sess.target.cpu.as_ref().to_string()) == "v3" {
-                    self.linker_arg("-Bsymbolic");
+                    self.link_arg("-Bsymbolic");
                     if self.sess.opts.debuginfo == DebugInfo::None {
-                        self.linker_arg("--strip-all");
+                        self.link_arg("--strip-all");
                     }
                 }
             }

compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp

@@ -197,7 +197,7 @@ extern "C" void LLVMRustTimeTraceProfilerFinish(const char *FileName) {
   SUBTARGET_RISCV                                                              \
   SUBTARGET_LOONGARCH                                                          \
   SUBTARGET_BPF                                                                \
-  SUBTARGET_SBF                                                                \
+  SUBTARGET_SBF
 
 #define SUBTARGET(x)                                                           \
   namespace llvm {                                                             \

compiler/rustc_span/src/symbol.rs

@@ -1766,9 +1766,9 @@ symbols! {
         saturating_add,
         saturating_div,
         saturating_sub,
+        sbf_target_feature,
         search_unbox,
         select_unpredictable,
-        sbf_target_feature,
         self_in_typedefs,
         self_struct_ctor,
         semitransparent,

compiler/rustc_target/src/callconv/sbf.rs

@@ -31,7 +31,7 @@ fn classify_arg<Ty>(arg: &mut ArgAbi<'_, Ty>) {
     }
 }
 
-pub fn compute_abi_info<Ty>(fn_abi: &mut FnAbi<'_, Ty>) {
+pub(crate) fn compute_abi_info<Ty>(fn_abi: &mut FnAbi<'_, Ty>) {
     if !fn_abi.ret.is_ignore() {
         classify_ret(&mut fn_abi.ret);
     }

compiler/rustc_target/src/spec/base/sbf_base.rs

@@ -1,5 +1,5 @@
 use crate::abi::Endian;
-use crate::spec::{Cc, cvs, LinkerFlavor, Lld, PanicStrategy, Target, TargetOptions};
+use crate::spec::{Cc, cvs, LinkerFlavor, Lld, PanicStrategy, Target, TargetOptions, SymbolVisibility};
 
 const V0_LINKER_SCRIPT: &str = r"
 PHDRS
@@ -81,7 +81,7 @@ PHDRS
 }
 ";
 
-pub fn opts(version: &'static str) -> TargetOptions {
+pub(crate) fn opts(version: &'static str) -> TargetOptions {
     let mut linker_args: Vec<&str> = vec![
         "--threads=1", "-z", "notext", "--Bdynamic"
     ];
@@ -118,7 +118,7 @@ pub fn opts(version: &'static str) -> TargetOptions {
     TargetOptions {
         allow_asm: true,
         c_int_width: "64".into(),
-        default_hidden_visibility: true,
+        default_visibility: Some(SymbolVisibility::Hidden),
         dll_prefix: "".into(),
         dynamic_linking: true,
         eh_frame_header: false,
@@ -148,7 +148,7 @@ pub fn opts(version: &'static str) -> TargetOptions {
     }
 }
 
-pub fn sbf_target(version: &'static str) -> Target {
+pub(crate) fn sbf_target(version: &'static str) -> Target {
     Target {
         llvm_target: "sbf".into(),
         pointer_width: 64,

compiler/rustc_target/src/spec/targets/sbf_solana_solana.rs

@@ -1,6 +1,6 @@
 use crate::spec::Target;
 use crate::spec::base::sbf_base;
 
-pub fn target() -> Target {
+pub(crate) fn target() -> Target {
     sbf_base::sbf_target("v0")
 }

compiler/rustc_target/src/spec/targets/sbpf_solana_solana.rs

@@ -1,6 +1,6 @@
 use crate::spec::Target;
 use crate::spec::base::sbf_base;
 
-pub fn target() -> Target {
+pub(crate) fn target() -> Target {
     sbf_base::sbf_target("v0")
 }

compiler/rustc_target/src/spec/targets/sbpfv1_solana_solana.rs

@@ -1,6 +1,6 @@
 use crate::spec::Target;
 use crate::spec::base::sbf_base;
 
-pub fn target() -> Target {
+pub(crate) fn target() -> Target {
     sbf_base::sbf_target("v1")
 }

compiler/rustc_target/src/spec/targets/sbpfv2_solana_solana.rs

@@ -1,6 +1,6 @@
 use crate::spec::Target;
 use crate::spec::base::sbf_base;
 
-pub fn target() -> Target {
+pub(crate) fn target() -> Target {
     sbf_base::sbf_target("v2")
 }

compiler/rustc_target/src/spec/targets/sbpfv3_solana_solana.rs

@@ -1,6 +1,6 @@
 use crate::spec::Target;
 use crate::spec::base::sbf_base;
 
-pub fn target() -> Target {
+pub(crate) fn target() -> Target {
     sbf_base::sbf_target("v3")
 }

config.toml

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2025 Anza Technology Inc. <https://www.anza.xyz>
+#
+# SPDX-License-Identifier: MIT
+
 # Sample TOML configuration file for building Rust.
 #
 # To configure rustbuild, copy this file to the directory from which you will be

library/Cargo.lock

@@ -62,8 +62,7 @@ dependencies = [
 [[package]]
 name = "compiler_builtins"
 version = "0.1.138"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53f0ea7fff95b51f84371588f06062557e96bbe363d2b36218ddb806f3ca8611"
+source = "git+https://github.com/anza-xyz/compiler-builtins?tag=solana-tools-v1.47#bf501f2f0a7d38d6dca6aab067017a288d2bf2dd"
 dependencies = [
  "cc",
  "rustc-std-workspace-core",

library/Cargo.toml

@@ -45,3 +45,4 @@ rustc-demangle.debug = 0
 rustc-std-workspace-core = { path = 'rustc-std-workspace-core' }
 rustc-std-workspace-alloc = { path = 'rustc-std-workspace-alloc' }
 rustc-std-workspace-std = { path = 'rustc-std-workspace-std' }
+compiler_builtins = { git = "https://github.com/anza-xyz/compiler-builtins", tag = "solana-tools-v1.47" }

library/alloc/Cargo.toml

@@ -10,7 +10,7 @@ edition = "2021"
 
 [dependencies]
 core = { path = "../core" }
-compiler_builtins = { git = "https://github.com/anza-xyz/compiler-builtins", tag = "solana-tools-v1.44" , features = ['rustc-dep-of-std'] }
+compiler_builtins = { git = "https://github.com/anza-xyz/compiler-builtins", tag = "solana-tools-v1.47", features = ['rustc-dep-of-std'] }
 
 [dev-dependencies]
 rand = { version = "0.8.5", default-features = false, features = ["alloc"] }
@@ -53,4 +53,5 @@ check-cfg = [
     'cfg(no_rc)',
     'cfg(no_sync)',
     'cfg(randomized_layouts)',
+    'cfg(target_family, values("solana"))'
 ]

library/alloc/src/alloc.rs

@@ -179,6 +179,7 @@ pub unsafe fn alloc_zeroed(layout: Layout) -> *mut u8 {
     unsafe {
         // Make sure we don't accidentally allow omitting the allocator shim in
         // stable code until it is actually stabilized.
+        #[cfg(not(target_family = "solana"))]
         core::ptr::read_volatile(&__rust_no_alloc_shim_is_unstable);
 
         __rust_alloc_zeroed(layout.size(), layout.align())