[SOL] Fixes for the 1.95 release

Author: nagisa

bootstrap.toml

@@ -108,8 +108,10 @@ link-shared = false
 # Whether or not to specify `-DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=YES`
 #allow-old-toolchain = false
 
+clang = true
+
 # Which LLVM projects to build along with the LLVM base libraries/tools
-enable-projects = "clang;lld;lldb"
+enable-projects = "lld;lldb"
 
 download-ci-llvm = false
 

compiler/rustc_codegen_llvm/src/allocator.rs

@@ -1,3 +1,8 @@
+use crate::attributes::llfn_attrs_from_instance;
+use crate::builder::SBuilder;
+use crate::declare::declare_simple_fn;
+use crate::llvm::{self, FromGeneric, TRUE, Type};
+use crate::{SimpleCx, attributes, debuginfo};
 use libc::c_uint;
 use rustc_ast::expand::allocator::{
     AllocatorMethod, AllocatorTy, NO_ALLOC_SHIM_IS_UNSTABLE, SpecialAllocatorMethod,
@@ -9,12 +14,6 @@ use rustc_middle::middle::codegen_fn_attrs::{CodegenFnAttrFlags, CodegenFnAttrs}
 use rustc_middle::ty::TyCtxt;
 use rustc_session::config::DebugInfo;
 use rustc_symbol_mangling::mangle_internal_symbol;
-use rustc_target::spec::Arch;
-use crate::attributes::llfn_attrs_from_instance;
-use crate::builder::SBuilder;
-use crate::declare::declare_simple_fn;
-use crate::llvm::{self, FromGeneric, TRUE, Type};
-use crate::{SimpleCx, attributes, debuginfo};
 
 pub(crate) unsafe fn codegen(
     tcx: TyCtxt<'_>,
@@ -86,19 +85,16 @@ pub(crate) unsafe fn codegen(
         );
     }
 
-    if tcx.sess.target.arch != 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,
-            &CodegenFnAttrs::new(),
-        );
-    }
+    create_wrapper_function(
+        tcx,
+        &cx,
+        &mangle_internal_symbol(tcx, NO_ALLOC_SHIM_IS_UNSTABLE),
+        None,
+        &[],
+        None,
+        false,
+        &CodegenFnAttrs::new(),
+    );
 
     if tcx.sess.opts.debuginfo != DebugInfo::None {
         let dbg_cx = debuginfo::CodegenUnitDebugContext::new(cx.llmod);

compiler/rustc_codegen_llvm/src/va_arg.rs

@@ -1176,6 +1176,7 @@ pub(super) fn emit_va_arg<'ll, 'tcx>(
         ),
 
         Arch::Bpf => bug!("bpf does not support c-variadic functions"),
+        Arch::Sbf => bug!("sbf does not support c-variadic functions"),
         Arch::SpirV => bug!("spirv does not support c-variadic functions"),
 
         Arch::Mips | Arch::Mips32r6 | Arch::Mips64 | Arch::Mips64r6 => {

compiler/rustc_codegen_ssa/src/back/linker.rs

@@ -482,14 +482,20 @@ impl<'a> GccLinker<'a> {
                 }
             }
 
-            if self.sess.target.arch == "bpf" || self.sess.target.arch == "sbf" {
+            if let Arch::Bpf | Arch::Sbf = self.sess.target.arch {
                 if self.sess.opts.test {
                     self.link_arg("--entry=main");
                 } else {
                     self.link_arg("--entry=entrypoint");
                 }
 
-                let cpu_type = self.sess.opts.cg.target_cpu.as_ref().cloned()
+                let cpu_type = self
+                    .sess
+                    .opts
+                    .cg
+                    .target_cpu
+                    .as_ref()
+                    .cloned()
                     .unwrap_or(self.sess.target.cpu.as_ref().to_string());
                 if cpu_type == "v3" || cpu_type == "v4" {
                     self.link_arg("-Bsymbolic");

compiler/rustc_codegen_ssa/src/base.rs

@@ -498,7 +498,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 == Os::Uefi {
             cx.type_func(&[cx.type_ptr(), cx.type_ptr()], cx.type_isize())
         } else if cx.sess().target.main_needs_argc_argv {
@@ -560,6 +559,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);
         if cx.sess().target.os == Os::Uefi {
             bx.ret(result);
         } else {

compiler/rustc_interface/src/passes.rs

@@ -44,7 +44,7 @@ use rustc_span::{
 };
 use rustc_trait_selection::{solve, traits};
 use tracing::{info, instrument};
-
+use rustc_target::spec::Arch;
 use crate::interface::Compiler;
 use crate::{errors, limits, proc_macro_decls, util};
 
@@ -1328,6 +1328,10 @@ pub fn collect_crate_types(
     // If we're generating a test executable, then ignore all other output
     // styles at all other locations
     if session.opts.test {
+        if session.target.arch == Arch::Sbf || session.target.arch == Arch::Bpf {
+            return vec![CrateType::Cdylib];
+        }
+
         if !session.target.executables {
             session.dcx().emit_warn(errors::UnsupportedCrateTypeForTarget {
                 crate_type: CrateType::Executable,

compiler/rustc_passes/src/entry.rs

@@ -6,6 +6,7 @@ use rustc_middle::query::Providers;
 use rustc_middle::ty::TyCtxt;
 use rustc_session::config::{CrateType, EntryFnType, sigpipe};
 use rustc_span::{RemapPathScopeComponents, Span};
+use rustc_target::spec::Arch;
 
 use crate::errors::{ExternMain, MultipleRustcMain, NoMainErr};
 
@@ -22,7 +23,7 @@ struct EntryContext<'tcx> {
 
 fn entry_fn(tcx: TyCtxt<'_>, (): ()) -> Option<(DefId, EntryFnType)> {
     let any_exe = tcx.crate_types().contains(&CrateType::Executable);
-    let exe_only = (tcx.sess.target.arch != "bpf" && tcx.sess.target.arch != "sbf") || !tcx.sess.opts.test;
+    let exe_only = !matches!(tcx.sess.target.arch, Arch::Bpf | Arch::Sbf) || !tcx.sess.opts.test;
     if !any_exe && exe_only {
         // No need to find a main function.
         return None;

compiler/rustc_session/src/session.rs

@@ -853,7 +853,7 @@ impl Session {
         // and most benchmarks agreed it was roughly a local optimum. Not very
         // scientific.
 
-        if self.target.options.vendor == "solana" {
+        if self.target.options.is_like_solana {
             // Default to 1 for SBF programs. It makes a huge difference in
             // terms of generated code size for us
             // (https://github.com/rust-lang/rust/issues/47745) and compilation

compiler/rustc_span/src/symbol.rs

@@ -1808,6 +1808,7 @@ symbols! {
         sanitizer_runtime,
         saturating_add,
         saturating_sub,
+        sbf,
         sbf_target_feature,
         sdylib,
         search_unbox,

compiler/rustc_target/src/callconv/mod.rs

@@ -703,7 +703,7 @@ impl<'a, Ty> FnAbi<'a, Ty> {
             Arch::RiscV32 | Arch::RiscV64 => riscv::compute_abi_info(cx, self),
             Arch::Wasm32 | Arch::Wasm64 => wasm::compute_abi_info(cx, self),
             Arch::Bpf => bpf::compute_abi_info(cx, self),
-            Arch::Sbf => sbf::compute_abi_info(self),
+            Arch::Sbf => sbf::compute_abi_info(cx, self),
             arch @ (Arch::SpirV | Arch::Other(_)) => {
                 panic!("no lowering implemented for {arch}")
             }