[SOL] Adjust compiler after upgrade to 1.75.0

LucasSte · LucasSte · commit beecea37b49e · 2024-07-10T19:37:25.000-03:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -206,7 +206,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
@@ -228,6 +228,9 @@ jobs:
       - name: show the current environment
         run: src/ci/scripts/dump-environment.sh
         if: success() && !env.SKIP_JOB
+      - name: install awscli
+        run: src/ci/scripts/install-awscli.sh
+        if: success() && !env.SKIP_JOB
       - name: install sccache
         run: src/ci/scripts/install-sccache.sh
         if: success() && !env.SKIP_JOB
@@ -237,6 +240,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
@@ -429,7 +435,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
diff --git a/Cargo.lock b/Cargo.lock
@@ -791,8 +791,8 @@ dependencies = [
 name = "core"
 version = "0.0.0"
 dependencies = [
- "getrandom 0.1.14",
- "rand 0.7.3",
+ "getrandom 0.1.16",
+ "rand",
  "rand_xorshift",
 ]
 
@@ -1560,7 +1560,7 @@ checksum = "a06fddc2749e0528d2813f95e050e87e52c8cbbae56223b9babf73b3e53b0cc6"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
 ]
 
 [[package]]
@@ -2468,7 +2468,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
 dependencies = [
  "libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "windows-sys 0.48.0",
 ]
 
@@ -3149,7 +3149,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.10",
 ]
 
 [[package]]
@@ -5275,7 +5275,7 @@ dependencies = [
  "rustc-demangle",
  "std_detect",
  "unwind",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
 ]
 
 [[package]]
@@ -6146,7 +6146,7 @@ version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.10",
 ]
 
 [[package]]
@@ -6186,6 +6186,12 @@ dependencies = [
  "try-lock",
 ]
 
+[[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"
@@ -6675,8 +6681,3 @@ dependencies = [
  "crossbeam-utils",
  "flate2",
 ]
-
-[[patch.unused]]
-name = "compiler_builtins"
-version = "0.1.76"
-source = "git+https://github.com/solana-labs/compiler-builtins#2044d7e16a99d951853ce362e384027dec4c5b92"
diff --git a/Cargo.toml b/Cargo.toml
@@ -107,7 +107,7 @@ debug = 0
 strip = true
 
 [patch.crates-io]
-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" }
 # See comments in `library/rustc-std-workspace-core/README.md` for what's going on
 # here
 rustc-std-workspace-core = { path = 'library/rustc-std-workspace-core' }
diff --git a/compiler/rustc_codegen_ssa/src/base.rs b/compiler/rustc_codegen_ssa/src/base.rs
@@ -419,7 +419,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 {
@@ -498,7 +497,7 @@ pub fn maybe_create_entry_wrapper<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>>(
             bx.call(start_ty, None, None, start_fn, &args, None, instance)
         };
 
-        let result = bx.call(start_ty, None, start_fn, &args, None);
+        let result = bx.call(start_ty, None, None, start_fn, &args, None);
         if cx.sess().target.os.contains("uefi") {
             bx.ret(result);
         } else {
diff --git a/compiler/rustc_target/src/spec/base/mod.rs b/compiler/rustc_target/src/spec/base/mod.rs
@@ -22,6 +22,7 @@ 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;
diff --git a/compiler/rustc_target/src/spec/base/sbf_base.rs b/compiler/rustc_target/src/spec/base/sbf_base.rs
@@ -1,5 +1,5 @@
 use crate::abi::Endian;
-use super::{Cc, cvs, LinkerFlavor, Lld, PanicStrategy, TargetOptions};
+use crate::spec::{Cc, cvs, LinkerFlavor, Lld, PanicStrategy, TargetOptions};
 
 pub fn opts() -> TargetOptions {
     let linker_script = r"
diff --git a/compiler/rustc_target/src/spec/targets/bpfel_unknown_unknown.rs b/compiler/rustc_target/src/spec/targets/bpfel_unknown_unknown.rs
@@ -1,5 +1,5 @@
 use crate::spec::Target;
-use crate::spec::sbf_base;
+use crate::spec::base::sbf_base;
 
 pub fn target() -> Target {
     Target {
diff --git a/compiler/rustc_target/src/spec/targets/sbf_solana_solana.rs b/compiler/rustc_target/src/spec/targets/sbf_solana_solana.rs
@@ -1,5 +1,5 @@
 use crate::spec::Target;
-use crate::spec::sbf_base;
+use crate::spec::base::sbf_base;
 
 pub fn target() -> Target {
     Target {
diff --git a/library/alloc/src/alloc.rs b/library/alloc/src/alloc.rs
@@ -432,7 +432,7 @@ 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)
     }
 }
 
diff --git a/library/std/src/backtrace.rs b/library/std/src/backtrace.rs
@@ -95,22 +95,14 @@ use crate::env;
 #[cfg(not(target_family = "solana"))]
 use crate::ffi::c_void;
 use crate::fmt;
-<<<<<<< HEAD
+#[cfg(not(target_family = "solana"))]
 use crate::panic::UnwindSafe;
-use crate::sync::atomic::{AtomicU8, Ordering::Relaxed};
-use crate::sync::LazyLock;
-#[cfg(not(any(target_arch = "bpf", target_arch = "sbf")))]
-use crate::sys_common::backtrace::{lock, output_filename, set_image_base};
-=======
 #[cfg(not(target_family = "solana"))]
-use crate::sync::atomic::{AtomicUsize, Ordering::Relaxed};
+use crate::sync::atomic::{AtomicU8, Ordering::Relaxed};
 #[cfg(not(target_family = "solana"))]
 use crate::sync::LazyLock;
 #[cfg(not(target_family = "solana"))]
-use crate::sys_common::backtrace::{lock, output_filename};
-#[cfg(not(target_family = "solana"))]
-use crate::vec::Vec;
->>>>>>> 2a5aa6a151d ([SOL] Adjust SBF customization after upgrading to rust 1.65.0)
+use crate::sys_common::backtrace::{lock, output_filename, set_image_base};
 
 /// A captured OS thread stack backtrace.
 ///
@@ -494,8 +486,10 @@ impl fmt::Display for Backtrace {
     }
 }
 
+#[cfg(not(target_family = "solana"))]
 type LazyResolve = impl (FnOnce() -> Capture) + Send + Sync + UnwindSafe;
 
+#[cfg(not(target_family = "solana"))]
 fn lazy_resolve(mut capture: Capture) -> LazyResolve {
     move || {
         // Use the global backtrace lock to synchronize this as it's a
diff --git a/library/std/src/panicking.rs b/library/std/src/panicking.rs
@@ -11,7 +11,7 @@
 
 #[cfg(not(target_family = "solana"))]
 use crate::panic::BacktraceStyle;
-#[cfg(not(target_os = "solana"))]
+#[cfg(not(target_family = "solana"))]
 use core::panic::{PanicPayload};
 use core::panic::{Location, PanicInfo};
 
@@ -529,14 +529,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(not(target_arch = "bpf"))]
 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(not(target_arch = "bpf"))]
 pub unsafe fn r#try<R, F: FnOnce() -> R>(f: F) -> Result<R, Box<dyn Any + Send>> {
     union Data<F, R> {
         f: ManuallyDrop<F>,
@@ -932,6 +930,7 @@ fn rust_panic(_: &mut dyn PanicPayload) -> ! {
     unsafe {
         crate::intrinsics::abort();
     }
+}
 
 // Note: The panicking functions have been stripped and rewritten
 //       in order to save space in SBF programs.  Panic messages
@@ -973,6 +972,7 @@ pub fn begin_panic<M: Any + Send>(_msg: M) -> ! {
         None,
         Location::caller(),
         false,
+        false,
     );
     crate::sys::panic(&info);
 }
@@ -991,6 +991,7 @@ pub fn begin_panic_fmt(msg: &fmt::Arguments<'_>) -> ! {
         Some(msg),
         Location::caller(),
         false,
+        false,
     );
     crate::sys::panic(&info);
 }
diff --git a/library/std/src/sys/sbf/cmath.rs b/library/std/src/sys/sbf/cmath.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;
 }
diff --git a/library/std/src/sys/sbf/mod.rs b/library/std/src/sys/sbf/mod.rs
@@ -120,3 +120,8 @@ pub fn abort_internal() -> ! {
 pub fn hashmap_random_keys() -> (u64, u64) {
     (1, 2)
 }
+
+#[inline]
+pub fn is_interrupted(_errno: i32) -> bool {
+    false
+}
diff --git a/library/std/src/sys/sbf/os.rs b/library/std/src/sys/sbf/os.rs
@@ -61,6 +61,7 @@ pub fn current_exe() -> io::Result<PathBuf> {
     unsupported()
 }
 
+#[derive(Debug)]
 pub struct Env(Void);
 
 impl Iterator for Env {
@@ -70,6 +71,12 @@ impl Iterator for Env {
     }
 }
 
+impl Env {
+    pub fn str_debug(&self) -> impl fmt::Debug + '_ {
+        [OsString::new(), OsString::new()]
+    }
+}
+
 pub fn env() -> Env {
     panic!();
 }
diff --git a/src/bootstrap/Cargo.toml b/src/bootstrap/Cargo.toml
@@ -24,7 +24,7 @@ test = false
 
 [[bin]]
 name = "rustdoc"
-path = "bin/rustdoc.rs"
+path = "src/bin/rustdoc.rs"
 test = false
 
 [[bin]]
diff --git a/src/bootstrap/src/utils/cc_detect.rs b/src/bootstrap/src/utils/cc_detect.rs
@@ -136,9 +136,6 @@ pub fn find_target(build: &Build, target: TargetSelection) {
     {
         cfg.compiler(cxx);
         true
-    } else if &*target.triple == "sbf-solana-solana" || &*target.triple == "bpfel-unknown-unknown" {
-        set_compiler(&mut cfg, Language::CPlusPlus, target, config, build);
-        true
     } else {
         // Use an auto-detected compiler (or one configured via `CXX_target_triple` env vars).
         cfg.try_get_compiler().is_ok()
@@ -218,11 +215,9 @@ fn default_compiler(
                 None
             }
         }
-        "bpfel-unknown-unknown" => {
-            cfg.compiler(build.llvm_bin(target).join(compiler.clang()));
-        }
-        "sbf-solana-solana" => {
-            cfg.compiler(build.llvm_bin(target).join(compiler.clang()));
+
+        "bpfel-unknown-unknown" | "sbf-solana-solana" => {
+            Some(PathBuf::from(build.llvm_bin(target).join(compiler.clang())))
         }
 
         t if t.contains("musl") && compiler == Language::C => {
diff --git a/src/tools/tidy/src/extdeps.rs b/src/tools/tidy/src/extdeps.rs
@@ -5,7 +5,7 @@ use std::path::Path;
 
 /// List of allowed sources for packages.
 const ALLOWED_SOURCES: &[&str] = &["\"registry+https://github.com/rust-lang/crates.io-index\"",
-"\"git+https://github.com/solana-labs/compiler-builtins?tag=bpf-tools-v1.7#875087b410b77e0561b653882b431c84515eb044\""];
+"\"git+https://github.com/solana-labs/compiler-builtins?tag=solana-tools-v1.40#81ef46f3fe1357095acdd089a700890fe4e13974\""];
 
 /// Checks for external package sources. `root` is the path to the directory that contains the
 /// workspace `Cargo.toml`.

Original file line number	Diff line number	Diff line change
`@@ -432,7 +432,7 @@ pub mod __alloc_error_handler {`
`432`	`432`	`pub unsafe fn __rdl_oom(size: usize, _align: usize) -> ! {`
`433`	`433`	`core::panicking::panic_nounwind_fmt(format_args!(`
`434`	`434`	`"memory allocation of {size} bytes failed"`
`435`		`- ))`
	`435`	`+ ), /* force_no_backtrace */ false)`
`436`	`436`	`}`
`437`	`437`	`}`
`438`	`438`