[SOL] Adjust compiler after upgrade to 1.75.0

Author: LucasSte

.github/workflows/ci.yml

@@ -255,7 +255,7 @@ jobs:
       - name: disable git crlf conversion
         run: git config --global core.autocrlf false
       - name: checkout the source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: configure the PR in which the error message will be posted
@@ -294,6 +294,9 @@ jobs:
       - name: install clang
         run: src/ci/scripts/install-clang.sh
         if: success() && !env.SKIP_JOB
+      - name: install tidy
+        run: src/ci/scripts/install-tidy.sh
+        if: success() && !env.SKIP_JOB
       - name: install WIX
         run: src/ci/scripts/install-wix.sh
         if: success() && !env.SKIP_JOB
@@ -474,7 +477,7 @@ jobs:
           - name: x86_64-gnu-llvm-17
             env:
               RUST_BACKTRACE: 1
-            os: ubuntu-20.04-8core-32gb
+            os: ubuntu-latest
           - name: x86_64-gnu-llvm-16
             env:
               RUST_BACKTRACE: 1

Cargo.lock

@@ -1436,7 +1436,7 @@ checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
 ]
 
 [[package]]
@@ -2944,7 +2944,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.10",
 ]
 
 [[package]]
@@ -4987,6 +4987,46 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
+[[package]]
+name = "std"
+version = "0.0.0"
+dependencies = [
+ "addr2line",
+ "alloc",
+ "cfg-if",
+ "compiler_builtins",
+ "core",
+ "dlmalloc",
+ "fortanix-sgx-abi",
+ "hashbrown",
+ "hermit-abi",
+ "libc",
+ "miniz_oxide",
+ "object 0.32.2",
+ "panic_abort",
+ "panic_unwind",
+ "profiler_builtins",
+ "r-efi",
+ "r-efi-alloc",
+ "rand",
+ "rand_xorshift",
+ "rustc-demangle",
+ "std_detect",
+ "unwind",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "std_detect"
+version = "0.1.5"
+dependencies = [
+ "cfg-if",
+ "compiler_builtins",
+ "libc",
+ "rustc-std-workspace-alloc",
+ "rustc-std-workspace-core",
+]
+
 [[package]]
 name = "string_cache"
 version = "0.8.7"
@@ -5710,7 +5750,7 @@ version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.10",
 ]
 
 [[package]]
@@ -5741,6 +5781,12 @@ 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"
@@ -6342,3 +6388,15 @@ dependencies = [
  "quote",
  "syn 2.0.79",
 ]
+
+[[package]]
+name = "zip"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261"
+dependencies = [
+ "byteorder",
+ "crc32fast",
+ "crossbeam-utils",
+ "flate2",
+]

compiler/rustc_codegen_ssa/src/base.rs

@@ -451,7 +451,6 @@ pub fn maybe_create_entry_wrapper<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>>(
     ) -> Bx::Function {
         // The entry function is either `int main(void)` or `int main(int argc, char **argv)`, or
         // `usize efi_main(void *handle, void *system_table)` depending on the target.
-        let is_bpf = cx.sess().target.arch == "bpf" && cx.sess().opts.test;
         let llfty = if cx.sess().target.os.contains("uefi") {
             cx.type_func(&[cx.type_ptr(), cx.type_ptr()], cx.type_isize())
         } else if cx.sess().target.main_needs_argc_argv {
@@ -523,8 +522,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);
-
+        let result = bx.call(start_ty, None, None, start_fn, &args, None);
         if cx.sess().target.os.contains("uefi") {
             bx.ret(result);
         } else {

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

@@ -22,14 +22,14 @@ pub(crate) mod netbsd;
 pub(crate) mod nto_qnx;
 pub(crate) mod openbsd;
 pub(crate) mod redox;
+pub(crate) mod sbf_base;
 pub(crate) mod solaris;
 pub(crate) mod solid;
 pub(crate) mod teeos;
 pub(crate) mod thumb;
 pub(crate) mod uefi_msvc;
 pub(crate) mod unikraft_linux_musl;
 pub(crate) mod vxworks;
-pub(crate) mod sbf_base;
 pub(crate) mod wasm;
 pub(crate) mod windows_gnu;
 pub(crate) mod windows_gnullvm;

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

@@ -59,7 +59,6 @@ SECTIONS
         requires_lto: false,
         singlethread: true,
         vendor: "solana".into(),
-        c_enum_min_bits: Some(32),
         .. Default::default()
     }
 }

compiler/rustc_target/src/spec/sbf_base.rs

@@ -15,4 +15,4 @@ pub(crate) fn target() -> Target {
             std: None,
         },
     }
-}
+}

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

@@ -42,7 +42,7 @@ rustc-demangle.debug = 0
 [patch.crates-io]
 # See comments in `library/rustc-std-workspace-core/README.md` for what's going on
 # here
-compiler_builtins = { git = "https://github.com/solana-labs/compiler-builtins" }
+compiler_builtins = { git = "https://github.com/solana-labs/compiler-builtins", tag = "solana-tools-v1.40" }
 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' }

library/Cargo.toml

@@ -448,6 +448,6 @@ pub mod __alloc_error_handler {
     pub unsafe fn __rdl_oom(size: usize, _align: usize) -> ! {
         core::panicking::panic_nounwind_fmt(format_args!(
             "memory allocation of {size} bytes failed"
-        ))
+        ), /* force_no_backtrace */ false)
     }
 }

library/alloc/src/alloc.rs

@@ -95,15 +95,14 @@ use crate::env;
 #[cfg(not(target_family = "solana"))]
 use crate::ffi::c_void;
 use crate::fmt;
+#[cfg(not(target_family = "solana"))]
 use crate::panic::UnwindSafe;
-use crate::sync::atomic::AtomicU8;
-use crate::sync::atomic::Ordering::Relaxed;
-#[cfg(not(any(target_arch = "bpf", target_arch = "sbf")))]
-use crate::sys::backtrace::{lock, output_filename, set_image_base};
+#[cfg(not(target_family = "solana"))]
+use crate::sync::atomic::{AtomicU8, Ordering::Relaxed};
 #[cfg(not(target_family = "solana"))]
 use crate::sync::LazyLock;
 #[cfg(not(target_family = "solana"))]
-use crate::vec::Vec;
+use crate::sys::backtrace::{lock, output_filename, set_image_base};
 
 /// A captured OS thread stack backtrace.
 ///
@@ -165,8 +164,8 @@ pub struct BacktraceFrame {
 }
 
 #[derive(Debug)]
+#[cfg(not(target_family = "solana"))]
 enum RawFrame {
-    #[cfg(not(target_family = "solana"))]
     Actual(backtrace_rs::Frame),
     #[cfg(test)]
     Fake,
@@ -487,6 +486,7 @@ impl fmt::Display for Backtrace {
     }
 }
 
+#[cfg(not(target_family = "solana"))]
 mod helper {
     use super::*;
     pub(super) type LazyResolve = impl (FnOnce() -> Capture) + Send + Sync + UnwindSafe;
@@ -523,6 +523,7 @@ mod helper {
         }
     }
 }
+#[cfg(not(target_family = "solana"))]
 use helper::*;
 
 #[cfg(not(target_family = "solana"))]

library/std/src/backtrace.rs

@@ -9,22 +9,23 @@
 
 #![deny(unsafe_op_in_unsafe_fn)]
 
-#[cfg(not(target_os = "solana"))]
+#[cfg(not(target_family = "solana"))]
 use crate::panic::BacktraceStyle;
-#[cfg(all(not(target_arch = "bpf"), not(target_arch = "sbf")))]
-use crate::intrinsics;
-#[cfg(not(target_os = "solana"))]
-use crate::panic::PanicHookInfo;
-#[cfg(not(target_os = "solana"))]
+#[cfg(not(target_family = "solana"))]
 use core::panic::PanicPayload;
+#[cfg(target_family = "solana")]
+use core::panic::PanicInfo;
 use core::panic::Location;
+
 use crate::any::Any;
+use crate::fmt;
+use crate::intrinsics;
+#[cfg(not(target_os = "solana"))]
+use crate::panic::PanicHookInfo;
 #[cfg(not(test))]
 use crate::io::try_set_output_capture;
 use crate::mem::ManuallyDrop;
 #[cfg(not(target_family = "solana"))]
-use crate::fmt;
-#[cfg(not(target_family = "solana"))]
 use crate::mem;
 #[cfg(not(target_family = "solana"))]
 use crate::process;
@@ -524,14 +525,12 @@ pub use realstd::rt::panic_count;
 
 /// Invoke a closure, capturing the cause of an unwinding panic if one occurs.
 #[cfg(feature = "panic_immediate_abort")]
-#[cfg(all(not(target_arch = "bpf"), not(target_arch = "sbf")))]
 pub unsafe fn r#try<R, F: FnOnce() -> R>(f: F) -> Result<R, Box<dyn Any + Send>> {
     Ok(f())
 }
 
 /// Invoke a closure, capturing the cause of an unwinding panic if one occurs.
 #[cfg(not(feature = "panic_immediate_abort"))]
-#[cfg(all(not(target_arch = "bpf"), not(target_arch = "sbf")))]
 pub unsafe fn r#try<R, F: FnOnce() -> R>(f: F) -> Result<R, Box<dyn Any + Send>> {
     union Data<F, R> {
         f: ManuallyDrop<F>,
@@ -987,6 +986,7 @@ pub fn begin_panic<M: Any + Send>(_msg: M) -> ! {
         None,
         Location::caller(),
         false,
+        false,
     );
     crate::sys::panic(&info);
 }
@@ -1005,6 +1005,7 @@ pub fn begin_panic_fmt(msg: &fmt::Arguments<'_>) -> ! {
         Some(msg),
         Location::caller(),
         false,
+        false,
     );
     crate::sys::panic(&info);
 }

library/std/src/panicking.rs

@@ -26,4 +26,8 @@ extern {
     pub fn tanf(n: f32) -> f32;
     pub fn tanh(n: f64) -> f64;
     pub fn tanhf(n: f32) -> f32;
+    pub fn tgamma(n: f64) -> f64;
+    pub fn tgammaf(n: f32) -> f32;
+    pub fn lgamma_r(n: f64, s: &mut i32) -> f64;
+    pub fn lgammaf_r(n: f32, s: &mut i32) -> f32;
 }

library/std/src/sys/sbf/cmath.rs

@@ -115,3 +115,8 @@ pub fn abort_internal() -> ! {
 pub fn hashmap_random_keys() -> (u64, u64) {
     (1, 2)
 }
+
+#[inline]
+pub fn is_interrupted(_errno: i32) -> bool {
+    false
+}