[SOL] Adjust SBF customization after upgrading to rust 1.72.0

Author: dmakarov

compiler/rustc_codegen_llvm/src/allocator.rs

@@ -81,16 +81,18 @@ pub(crate) unsafe fn codegen(
         let llval = llvm::LLVMConstInt(i8, val as u64, False);
         llvm::set_initializer(ll_g, llval);
 
-        // __rust_no_alloc_shim_is_unstable_v2
-        create_wrapper_function(
-            tcx,
-            &cx,
-            &mangle_internal_symbol(tcx, NO_ALLOC_SHIM_IS_UNSTABLE),
-            None,
-            &[],
-            None,
-            false,
-        );
+        if tcx.sess.target.arch != "sbf" {
+            // __rust_no_alloc_shim_is_unstable_v2
+            create_wrapper_function(
+                tcx,
+                &cx,
+                &mangle_internal_symbol(tcx, NO_ALLOC_SHIM_IS_UNSTABLE),
+                None,
+                &[],
+                None,
+                false,
+            );
+        }
     }
 
     if tcx.sess.opts.debuginfo != DebugInfo::None {

compiler/rustc_codegen_ssa/src/back/link.rs

@@ -2078,7 +2078,7 @@ fn patch_synthetic_object_file(sess: &Session, path: &PathBuf) {
             sf.write(&EM_SBF).unwrap();
         }
     } else {
-        sess.fatal(&format!("failed to patch {}", path.display()));
+        sess.fatal(format!("failed to patch {}", path.display()));
     }
 }
 

config.toml

@@ -74,7 +74,7 @@ experimental-targets = "BPF;SBF"
 # each linker process.
 # If absent or 0, linker invocations are treated like any other job and
 # controlled by rustbuild's -j parameter.
-#link-jobs = 0
+link-jobs = 2
 
 # When invoking `llvm-config` this configures whether the `--shared` argument is
 # passed to prefer linking to shared libraries.

library/alloc/src/alloc.rs

@@ -31,9 +31,14 @@ unsafe extern "Rust" {
     #[rustc_std_internal_symbol]
     fn __rust_alloc_zeroed(size: usize, align: usize) -> *mut u8;
 
+<<<<<<< HEAD
     #[rustc_nounwind]
     #[rustc_std_internal_symbol]
     fn __rust_no_alloc_shim_is_unstable_v2();
+=======
+    #[cfg(not(target_family = "solana"))]
+    static __rust_no_alloc_shim_is_unstable: u8;
+>>>>>>> 29896c3591c ([SOL] Adjust SBF customization after upgrading to rust 1.72.0)
 }
 
 /// The global memory allocator.
@@ -89,7 +94,12 @@ pub unsafe fn alloc(layout: Layout) -> *mut u8 {
     unsafe {
         // Make sure we don't accidentally allow omitting the allocator shim in
         // stable code until it is actually stabilized.
+<<<<<<< HEAD
         __rust_no_alloc_shim_is_unstable_v2();
+=======
+        #[cfg(not(target_family = "solana"))]
+        core::ptr::read_volatile(&__rust_no_alloc_shim_is_unstable);
+>>>>>>> 29896c3591c ([SOL] Adjust SBF customization after upgrading to rust 1.72.0)
 
         __rust_alloc(layout.size(), layout.align())
     }

library/std/Cargo.toml

@@ -15,6 +15,7 @@ crate-type = ["dylib", "rlib"]
 [dependencies]
 alloc = { path = "../alloc", public = true }
 cfg-if = { version = "1.0", features = ['rustc-dep-of-std'] }
+panic_unwind = { path = "../panic_unwind", optional = true }
 panic_abort = { path = "../panic_abort" }
 core = { path = "../core", public = true }
 compiler_builtins = { path = "../compiler-builtins/compiler-builtins" }

library/std/src/io/stdio.rs

@@ -525,6 +525,9 @@ impl Read for Stdin {
     fn read(&mut self, _buf: &mut [u8]) -> io::Result<usize> {
         Ok(0)
     }
+    fn read_buf(&mut self, _buf: BorrowedCursor<'_>) -> io::Result<()> {
+        Ok(())
+    }
     fn read_vectored(&mut self, _bufs: &mut [IoSliceMut<'_>]) -> io::Result<usize> {
         Ok(0)
     }

library/std/src/panicking.rs

@@ -494,6 +494,7 @@ pub mod panic_count {
         })
     }
 
+    #[cfg(not(target_family = "solana"))]
     pub fn finished_panic_hook() {
         LOCAL_PANIC_COUNT.with(|c| {
             let (count, _) = c.get();

library/std/src/sync/mpmc/context.rs

@@ -2,6 +2,8 @@
 
 use super::select::Selected;
 use super::waker::current_thread_id;
+
+#[cfg(not(target_family = "solana"))]
 use crate::cell::Cell;
 use crate::ptr;
 use crate::sync::Arc;
@@ -33,6 +35,7 @@ struct Inner {
 
 impl Context {
     /// Creates a new context for the duration of the closure.
+    #[cfg(not(target_family = "solana"))]
     #[inline]
     pub fn with<F, R>(f: F) -> R
     where
@@ -62,6 +65,15 @@ impl Context {
             .unwrap_or_else(|_| f(&Context::new()))
     }
 
+    #[cfg(target_family = "solana")]
+    #[inline]
+    pub fn with<F, R>(f: F) -> R
+    where
+        F: FnOnce(&Context) -> R,
+    {
+        f(&Context::new())
+    }
+
     /// Creates a new `Context`.
     #[cold]
     fn new() -> Context {
@@ -76,6 +88,7 @@ impl Context {
     }
 
     /// Resets `select` and `packet`.
+    #[cfg(not(target_family = "solana"))]
     #[inline]
     fn reset(&self) {
         self.inner.select.store(Selected::Waiting.into(), Ordering::Release);

library/std/src/sync/mpmc/waker.rs

@@ -200,10 +200,18 @@ impl Drop for SyncWaker {
 }
 
 /// Returns a unique id for the current thread.
+#[cfg(not(target_family = "solana"))]
 #[inline]
 pub fn current_thread_id() -> usize {
     // `u8` is not drop so this variable will be available during thread destruction,
     // whereas `thread::current()` would not be
     thread_local! { static DUMMY: u8 = const { 0 } }
     DUMMY.with(|x| (x as *const u8).addr())
 }
+
+/// Returns a unique id for the current thread.
+#[cfg(target_family = "solana")]
+#[inline]
+pub fn current_thread_id() -> usize {
+    0
+}

library/std/src/sys/pal/unsupported/thread_local_dtor.rs

@@ -0,0 +1,11 @@
+#![unstable(feature = "thread_local_internals", issue = "none")]
+
+ // unused on solana and wasm32-unknown-unknown
+#[cfg_attr(any(target_family = "solana", target_family = "wasm"), allow(unused))]
+pub unsafe fn register_dtor(_t: *mut u8, _dtor: unsafe extern "C" fn(*mut u8)) {
+    // FIXME: right now there is no concept of "thread exit", but this is likely
+    // going to show up at some point in the form of an exported symbol that the
+    // wasm runtime is going to be expected to call. For now we basically just
+    // ignore the arguments, but if such a function starts to exist it will
+    // likely look like the OSX implementation in `unix/fast_thread_local.rs`
+}