[SOL] Adjust SBF customization after upgrading to rust 1.68.0

dmakarov · LucasSte · commit 7d94317e7df7 · 2025-03-13T17:42:33.000-03:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -104,7 +104,6 @@ jobs:
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
-<<<<<<< HEAD
           fetch-depth: 2
 
       # Free up disk space on Linux by removing preinstalled components that
@@ -118,9 +117,6 @@ jobs:
       # Rust Log Analyzer can't currently detect the PR number of a GitHub
       # Actions build on its own, so a hint in the log message is needed to
       # point it in the right direction.
-=======
-          fetch-depth: 0
->>>>>>> 04bf0475aa2 ([SOL] Fix Ci error caused by insufficient git history fetched)
       - name: configure the PR in which the error message will be posted
         run: echo "[CI_PR_NUMBER=$num]"
         env:
diff --git a/compiler/rustc_target/src/spec/sbf_base.rs b/compiler/rustc_target/src/spec/sbf_base.rs
@@ -1,5 +1,5 @@
 use crate::abi::Endian;
-use super::{cvs, LinkArgs, LinkerFlavor, PanicStrategy, TargetOptions, LldFlavor};
+use super::{Cc, cvs, LinkerFlavor, Lld, PanicStrategy, TargetOptions};
 
 pub fn opts() -> TargetOptions {
     let linker_script = r"
@@ -28,13 +28,10 @@ SECTIONS
     }
 }
 ";
-    let mut lld_args = Vec::new();
-    lld_args.push("--threads=1".into());
-    lld_args.push("-z".into());
-    lld_args.push("notext".into());
-    let mut pre_link_args = LinkArgs::new();
-    pre_link_args.insert(LinkerFlavor::Ld, lld_args.clone());
-    pre_link_args.insert(LinkerFlavor::Lld(LldFlavor::Ld), lld_args);
+    let pre_link_args = TargetOptions::link_args(
+        LinkerFlavor::Gnu(Cc::No, Lld::No),
+        &["--threads=1", "-z", "notext"],
+    );
 
     TargetOptions {
         allow_asm: true,
@@ -50,8 +47,7 @@ SECTIONS
         families: cvs!["solana"],
         link_script: Some(linker_script.into()),
         linker: Some("rust-lld".into()),
-        linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
-        linker_is_gnu: true,
+        linker_flavor: LinkerFlavor::Gnu(Cc::No, Lld::Yes),
         main_needs_argc_argv: false,
         max_atomic_width: Some(64),
         no_default_libraries: true,
diff --git a/config.toml b/config.toml
@@ -108,6 +108,8 @@ link-shared = false
 # Which LLVM projects to build along with the LLVM base libraries/tools
 enable-projects = "clang;lld;lldb"
 
+download-ci-llvm = false
+
 # =============================================================================
 # General build configuration options
 # =============================================================================
diff --git a/library/core/tests/slice.rs b/library/core/tests/slice.rs
@@ -1809,9 +1809,9 @@ fn select_nth_unstable() {
     use rand::Rng;
     use rand::seq::SliceRandom;
 
-    let mut rng = StdRng::seed_from_u64(0);
+    let mut rng = crate::test_rng();
 
-    for len in (2..21).chain(200..201) {
+    for len in (2..21).chain(500..501) {
         let mut orig = vec![0; len];
 
         for &modulus in &[5, 10, 1000] {
diff --git a/library/std/Cargo.toml b/library/std/Cargo.toml
@@ -26,7 +26,7 @@ std_detect = { path = "../stdarch/crates/std_detect", default-features = false,
 ] }
 
 # Dependencies of the `backtrace` crate
-[target.'cfg(all(not(target_arch = "bpf"), not(target_arch = "sbf")))'.dependencies]
+[target.'cfg(not(target_family = "solana"))'.dependencies]
 addr2line = { version = "0.22.0", optional = true, default-features = false }
 rustc-demangle = { version = "0.1.24", features = ['rustc-dep-of-std'] }
 
diff --git a/library/std/src/error.rs b/library/std/src/error.rs
@@ -450,6 +450,7 @@ impl<E> Report<E>
 where
     E: Error,
 {
+    #[cfg(not(target_family = "solana"))]
     fn backtrace(&self) -> Option<&Backtrace> {
         // have to grab the backtrace on the first error directly since that error may not be
         // 'static
@@ -500,6 +501,7 @@ where
             }
         }
 
+        #[cfg(not(target_family = "solana"))]
         if self.show_backtrace {
             if let Some(backtrace) = self.backtrace() {
                 write!(f, "\n\nStack backtrace:\n{}", backtrace.to_string().trim_end())?;
diff --git a/library/std/src/io/stdio.rs b/library/std/src/io/stdio.rs
@@ -7,6 +7,7 @@ mod tests;
 #[cfg(not(target_family = "solana"))]
 use crate::cell::{Cell, RefCell};
 use crate::fmt;
+#[cfg(not(target_family = "solana"))]
 use crate::fs::File;
 use crate::io::prelude::*;
 use crate::panic::{RefUnwindSafe, UnwindSafe};
@@ -1340,6 +1341,7 @@ where
     }
 }
 
+#[cfg(not(target_family = "solana"))]
 fn print_to_buffer_if_capture_used(args: fmt::Arguments<'_>) -> bool {
     OUTPUT_CAPTURE_USED.load(Ordering::Relaxed)
         && OUTPUT_CAPTURE.try_with(|s| {
@@ -1356,6 +1358,7 @@ fn print_to_buffer_if_capture_used(args: fmt::Arguments<'_>) -> bool {
 /// Used by impl Termination for Result to print error after `main` or a test
 /// has returned. Should avoid panicking, although we can't help it if one of
 /// the Display impls inside args decides to.
+#[cfg(not(target_family = "solana"))]
 pub(crate) fn attempt_print_to_stderr(args: fmt::Arguments<'_>) {
     if print_to_buffer_if_capture_used(args) {
         return;
@@ -1420,6 +1423,7 @@ pub trait IsTerminal: crate::sealed::Sealed {
     fn is_terminal(&self) -> bool;
 }
 
+#[cfg(not(target_family = "solana"))]
 macro_rules! impl_is_terminal {
     ($($t:ty),*$(,)?) => {$(
         #[unstable(feature = "sealed", issue = "none")]
@@ -1435,6 +1439,7 @@ macro_rules! impl_is_terminal {
     )*}
 }
 
+#[cfg(not(target_family = "solana"))]
 impl_is_terminal!(File, Stdin, StdinLock<'_>, Stdout, StdoutLock<'_>, Stderr, StderrLock<'_>);
 
 #[unstable(
diff --git a/library/std/src/panicking.rs b/library/std/src/panicking.rs
@@ -11,7 +11,6 @@
 
 use core::panic::Location;
 #[cfg(not(target_os = "solana"))]
-use core::panic::PanicPayload;
 // make sure to use the stderr output configured
 // by libtest in the real copy of std
 #[cfg(all(test, not(target_family = "solana")))]
@@ -72,7 +71,7 @@ extern "C" fn __rust_foreign_exception() -> ! {
     rtabort!("Rust cannot catch foreign exceptions");
 }
 
-#[cfg(not(target_os = "solana"))]
+#[cfg(not(target_family = "solana"))]
 enum Hook {
     Default,
     Custom(Box<dyn Fn(&PanicHookInfo<'_>) + 'static + Sync + Send>),
@@ -89,15 +88,15 @@ impl Hook {
     }
 }
 
-#[cfg(not(target_os = "solana"))]
+#[cfg(not(target_family = "solana"))]
 impl Default for Hook {
     #[inline]
     fn default() -> Hook {
         Hook::Default
     }
 }
 
-#[cfg(not(target_os = "solana"))]
+#[cfg(not(target_family = "solana"))]
 static HOOK: RwLock<Hook> = RwLock::new(Hook::Default);
 
 /// Registers a custom panic hook, replacing the previously registered hook.
@@ -437,7 +436,7 @@ pub mod panic_count {
     //
     // This also updates thread-local state to keep track of whether a panic
     // hook is currently executing.
-    #[cfg(not(target_os = "solana"))]
+    #[cfg(not(target_family = "solana"))]
     pub fn increase(run_panic_hook: bool) -> Option<MustAbort> {
         let global_count = GLOBAL_PANIC_COUNT.fetch_add(1, Ordering::Relaxed);
         if global_count & ALWAYS_ABORT_FLAG != 0 {
@@ -505,7 +504,7 @@ pub mod panic_count {
 
     // Slow path is in a separate function to reduce the amount of code
     // inlined from `count_is_zero`.
-    #[cfg(not(target_os = "solana"))]
+    #[cfg(not(target_family = "solana"))]
     #[inline(never)]
     #[cold]
     fn is_zero_slow_path() -> bool {
diff --git a/library/std/src/process.rs b/library/std/src/process.rs
@@ -2452,10 +2452,15 @@ impl<T: Termination, E: fmt::Debug> Termination for Result<T, E> {
     fn report(self) -> ExitCode {
         match self {
             Ok(val) => val.report(),
+            #[cfg(not(target_family = "solana"))]
             Err(err) => {
                 io::attempt_print_to_stderr(format_args_nl!("Error: {err:?}"));
                 ExitCode::FAILURE
             }
+            #[cfg(target_family = "solana")]
+            Err(_err) => {
+                ExitCode::FAILURE
+            }
         }
     }
 }
diff --git a/library/std/src/rt.rs b/library/std/src/rt.rs
@@ -216,6 +216,7 @@ fn lang_start<T: crate::process::Termination + 'static>(
     main: fn() -> T,
     _argc: isize,
     _argv: *const *const u8,
+    _sigpipe: u8,
 ) -> isize {
     main().report().to_i32() as isize
 }
diff --git a/library/std/src/sync/mpmc/utils.rs b/library/std/src/sync/mpmc/utils.rs
@@ -3,6 +3,7 @@ use crate::ops::{Deref, DerefMut};
 
 /// Pads and aligns a value to the length of a cache line.
 #[derive(Clone, Copy, Default, Hash, PartialEq, Eq)]
+#[cfg_attr(target_family = "solana", repr(align(8)))]
 // Starting from Intel's Sandy Bridge, spatial prefetcher is now pulling pairs of 64-byte cache
 // lines at a time, so we have to align to 128 bytes rather than 64.
 //
@@ -66,6 +67,7 @@ use crate::ops::{Deref, DerefMut};
         target_arch = "mips64r6",
         target_arch = "riscv64",
         target_arch = "s390x",
+        target_family = "solana",
     )),
     repr(align(64))
 )]
diff --git a/library/std/src/sys/sbf/futex.rs b/library/std/src/sys/sbf/futex.rs
@@ -0,0 +1,14 @@
+use crate::sync::atomic::AtomicU32;
+use crate::time::Duration;
+
+pub fn futex_wait(_futex: &AtomicU32, _expected: u32, _timeout: Option<Duration>) -> bool {
+    false
+}
+
+#[inline]
+pub fn futex_wake(_futex: &AtomicU32) -> bool {
+    false
+}
+
+#[inline]
+pub fn futex_wake_all(_futex: &AtomicU32) {}
diff --git a/library/std/src/sys/sbf/mod.rs b/library/std/src/sys/sbf/mod.rs
@@ -20,6 +20,7 @@ pub mod args;
 pub mod cmath;
 pub mod env;
 pub mod fs;
+pub mod futex;
 pub mod io;
 pub mod memchr;
 pub mod net;
@@ -34,16 +35,17 @@ pub mod time;
 #[path = "../unix/os_str.rs"]
 pub mod os_str;
 
-pub mod condvar;
-pub mod mutex;
-pub mod rwlock;
 pub mod thread_local_dtor;
 pub mod thread_local_key;
 
+#[path = "../unix/locks"]
 pub mod locks {
-    pub use super::condvar::*;
-    pub use super::mutex::*;
-    pub use super::rwlock::*;
+    mod futex_condvar;
+    mod futex_mutex;
+    mod futex_rwlock;
+    pub(crate) use futex_condvar::Condvar;
+    pub(crate) use futex_mutex::Mutex;
+    pub(crate) use futex_rwlock::RwLock;
 }
 
 #[cfg(not(target_feature = "static-syscalls"))]
diff --git a/library/std/src/sys/sbf/pipe.rs b/library/std/src/sys/sbf/pipe.rs
@@ -18,6 +18,10 @@ impl AnonPipe {
         false
     }
 
+    pub fn read_to_end(&self, _buf: &mut Vec<u8>) -> io::Result<usize> {
+        match self.0 {}
+    }
+
     pub fn write(&self, _buf: &[u8]) -> io::Result<usize> {
         match self.0 {}
     }
diff --git a/library/std/src/sys/sbf/process.rs b/library/std/src/sys/sbf/process.rs
@@ -65,6 +65,10 @@ impl Command {
         unsupported()
     }
 
+    pub fn output(&mut self) -> io::Result<(ExitStatus, Vec<u8>, Vec<u8>)> {
+        unsupported()
+    }
+
     pub fn get_args(&self) -> CommandArgs<'_> {
         let mut iter = self.args.iter();
         iter.next();
diff --git a/library/std/src/sys/sbf/thread_local_key.rs b/library/std/src/sys/sbf/thread_local_key.rs
@@ -1,3 +1,4 @@
+#![allow(fuzzy_provenance_casts)]
 use crate::boxed::Box;
 use crate::ptr;
 
@@ -33,8 +34,3 @@ pub unsafe fn destroy(key: Key) {
         f(key.value);
     }
 }
-
-#[inline]
-pub fn requires_synchronized_create() -> bool {
-    false
-}
diff --git a/library/std/src/sys/sync/once/mod.rs b/library/std/src/sys/sync/once/mod.rs
@@ -18,6 +18,7 @@ cfg_if::cfg_if! {
         target_os = "dragonfly",
         target_os = "fuchsia",
         target_os = "hermit",
+        target_os = "solana",
     ))] {
         mod futex;
         pub use futex::{Once, OnceState};
diff --git a/library/std/src/thread/mod.rs b/library/std/src/thread/mod.rs
@@ -1274,7 +1274,7 @@ impl ThreadId {
                         Err(id) => last = id,
                     }
                 }
-            } else if #[cfg(not(target_os = "solana"))] {
+            } else if #[cfg(not(target_family = "solana"))] {
                 use crate::sync::{Mutex, PoisonError};
 
                 static COUNTER: Mutex<u64> = Mutex::new(0);
diff --git a/library/test/src/cli.rs b/library/test/src/cli.rs
@@ -2,6 +2,7 @@
 
 #[cfg(not(target_family = "solana"))]
 use std::env;
+#[cfg(not(target_family = "solana"))]
 use std::io::{self, IsTerminal};
 use std::path::PathBuf;
 
@@ -35,13 +36,19 @@ pub struct TestOpts {
 }
 
 impl TestOpts {
+    #[cfg(not(target_family = "solana"))]
     pub fn use_color(&self) -> bool {
         match self.color {
             ColorConfig::AutoColor => !self.nocapture && io::stdout().is_terminal(),
             ColorConfig::AlwaysColor => true,
             ColorConfig::NeverColor => false,
         }
     }
+
+    #[cfg(target_family = "solana")]
+    pub fn use_color(&self) -> bool {
+        false
+    }
 }
 
 /// Result of parsing the options.
@@ -332,6 +339,7 @@ fn parse_opts_impl(_matches: getopts::Matches) -> OptRes {
         skip: Vec::new(),
         time_options: None,
         options: Options::new(),
+        fail_fast: false,
     };
 
     Ok(test_opts)
diff --git a/library/test/src/lib.rs b/library/test/src/lib.rs
@@ -118,6 +118,7 @@ pub fn test_main(args: &[String], tests: Vec<TestDescAndFn>, options: Option<Opt
             process::exit(ERROR_EXIT_CODE);
         }
     } else {
+        #[cfg(not(target_family = "solana"))]
         if !opts.nocapture {
             // If we encounter a non-unwinding panic, flush any captured output from the current test,
             // and stop capturing output to ensure that the non-unwinding panic message is visible.
diff --git a/src/ci/docker/host-x86_64/sbf-solana-solana/Dockerfile b/src/ci/docker/host-x86_64/sbf-solana-solana/Dockerfile
@@ -22,9 +22,9 @@ ENV RUSTUP_INIT_SKIP_PATH_CHECK="yes"
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 
 RUN PATH="${HOME}/.cargo/bin:${PATH}" \
-    cargo install --git https://github.com/solana-labs/cargo-run-sbf-tests.git \
-    --rev b5500813b130ff7ce2d32e85f4e4e6377fe24cda \
-    --bin cargo-run-sbf-tests --root /usr/local
+    cargo install --git https://github.com/solana-labs/cargo-run-solana-tests.git \
+    --rev 12186c99173cc30771897932159b53acca836321 \
+    --bin cargo-run-solana-tests --root /usr/local
 
 COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh

Original file line number	Diff line number	Diff line change
`@@ -450,6 +450,7 @@ impl<E> Report<E>`
`450`	`450`	`where`
`451`	`451`	`E: Error,`
`452`	`452`	`{`
	`453`	`+ #[cfg(not(target_family = "solana"))]`
`453`	`454`	`fn backtrace(&self) -> Option<&Backtrace> {`
`454`	`455`	`// have to grab the backtrace on the first error directly since that error may not be`
`455`	`456`	`// 'static`
`@@ -500,6 +501,7 @@ where`
`500`	`501`	`}`
`501`	`502`	`}`
`502`	`503`
	`504`	`+ #[cfg(not(target_family = "solana"))]`
`503`	`505`	`if self.show_backtrace {`
`504`	`506`	`if let Some(backtrace) = self.backtrace() {`
`505`	`507`	`write!(f, "\n\nStack backtrace:\n{}", backtrace.to_string().trim_end())?;`
Original file line number	Diff line number	Diff line change
`@@ -2452,10 +2452,15 @@ impl<T: Termination, E: fmt::Debug> Termination for Result<T, E> {`
`2452`	`2452`	`fn report(self) -> ExitCode {`
`2453`	`2453`	`match self {`
`2454`	`2454`	`Ok(val) => val.report(),`
	`2455`	`+ #[cfg(not(target_family = "solana"))]`
`2455`	`2456`	`Err(err) => {`
`2456`	`2457`	`io::attempt_print_to_stderr(format_args_nl!("Error: {err:?}"));`
`2457`	`2458`	`ExitCode::FAILURE`
`2458`	`2459`	`}`
	`2460`	`+ #[cfg(target_family = "solana")]`
	`2461`	`+ Err(_err) => {`
	`2462`	`+ ExitCode::FAILURE`
	`2463`	`+ }`
`2459`	`2464`	`}`
`2460`	`2465`	`}`
`2461`	`2466`	`}`
Original file line number	Diff line number	Diff line change
`@@ -216,6 +216,7 @@ fn lang_start<T: crate::process::Termination + 'static>(`
`216`	`216`	`main: fn() -> T,`
`217`	`217`	`_argc: isize,`
`218`	`218`	`_argv: const const u8,`
	`219`	`+ _sigpipe: u8,`
`219`	`220`	`) -> isize {`
`220`	`221`	`main().report().to_i32() as isize`
`221`	`222`	`}`