[SOL] Adjustments after Rust 1.89 upgrade

Author: LucasSte

Cargo.lock

@@ -3144,12 +3144,14 @@ dependencies = [
 
 [[package]]
 name = "rustc-build-sysroot"
-version = "0.5.3"
-source = "git+https://github.com/anza-xyz/rustc-build-sysroot?tag=solana-tools-v1.51#34e8960e38904f424f410d4673a0b669af75ef4e"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b881c015c729b43105bbd3702a9bdecee28fafaa21126d1d62e454ec011a4b7"
 dependencies = [
  "anyhow",
  "rustc_version",
  "tempfile",
+ "toml 0.8.23",
  "walkdir",
 ]
 
@@ -5394,7 +5396,20 @@ dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit",
+ "toml_edit 0.19.15",
+]
+
+[[package]]
+name = "toml"
+version = "0.8.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
+dependencies = [
+ "indexmap",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit 0.22.27",
 ]
 
 [[package]]
@@ -5419,6 +5434,26 @@ dependencies = [
  "winnow 0.5.40",
 ]
 
+[[package]]
+name = "toml_edit"
+version = "0.22.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
+dependencies = [
+ "indexmap",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_write",
+ "winnow 0.7.11",
+]
+
+[[package]]
+name = "toml_write"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
+
 [[package]]
 name = "tracing"
 version = "0.1.37"

compiler/rustc_codegen_llvm/src/allocator.rs

@@ -81,18 +81,16 @@ pub(crate) unsafe fn codegen(
         let llval = llvm::LLVMConstInt(i8, val as u64, False);
         llvm::set_initializer(ll_g, llval);
 
-        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,
-            );
-        }
+        // __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_llvm/src/context.rs

@@ -864,7 +864,7 @@ impl<'ll> CodegenCx<'ll, '_> {
         // and we use it to implement intrinsics like `raw_eq` and `compare_bytes`
         if base_name == "memcmp" {
             let fn_ty = self
-                .type_func(&[self.type_ptr(), self.type_ptr(), self.type_isize()], self.type_int());
+                .type_func(&[self.type_ptr(), self.type_ptr(), self.type_isize()], self.type_i32());
             let f = self.declare_cfn("memcmp", llvm::UnnamedAddr::No, fn_ty);
 
             return (fn_ty, f);

compiler/rustc_codegen_llvm/src/intrinsic.rs

@@ -472,7 +472,7 @@ impl<'ll, 'tcx> IntrinsicCallBuilderMethods<'tcx> for Builder<'_, 'll, 'tcx> {
                 } else {
                     let n = self.const_usize(layout.size().bytes());
                     let cmp = self.call_intrinsic("memcmp", &[], &[a, b, n]);
-                    self.icmp(IntPredicate::IntEQ, cmp, self.const_int(self.type_int(), 0))
+                    self.icmp(IntPredicate::IntEQ, cmp, self.const_int(self.type_i32(), 0))
                 }
             }
 

compiler/rustc_codegen_ssa/src/base.rs

@@ -557,7 +557,7 @@ pub fn maybe_create_entry_wrapper<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>>(
         let (arg_argc, arg_argv) = get_argc_argv(&mut bx);
 
         let EntryFnType::Main { sigpipe } = entry_type;
-        let (start_fn, start_ty, args, instance) = if !is_bpf {
+        let (start_fn, start_ty, args, instance) = {
             let start_def_id = cx.tcx().require_lang_item(LangItem::Start, DUMMY_SP);
             let start_instance = ty::Instance::expect_resolve(
                 cx.tcx(),
@@ -578,18 +578,6 @@ pub fn maybe_create_entry_wrapper<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>>(
                 vec![rust_main, arg_argc, arg_argv, arg_sigpipe],
                 Some(start_instance),
             )
-        } else {
-            debug!("using user-defined start fn");
-            let start_ty = cx.type_func(&[], cx.type_void());
-            (rust_main, start_ty, Vec::new(), None)
-        };
-        
-        let result = if is_bpf {
-            let args = Vec::new();
-            bx.call(start_ty, None, None, start_fn, &args, None, instance);
-            bx.const_i32(0)
-        } else {
-            bx.call(start_ty, None, None, start_fn, &args, None, instance)
         };
 
         let result = bx.call(start_ty, None, None, start_fn, &args, None, instance);

compiler/rustc_middle/src/mir/consts.rs

@@ -576,34 +576,14 @@ impl<'tcx> TyCtxt<'tcx> {
     pub fn span_as_caller_location(self, span: Span) -> ConstValue<'tcx> {
         let topmost = span.ctxt().outer_expn().expansion_cause().unwrap_or(span);
         let caller = self.sess.source_map().lookup_char_pos(topmost.lo());
-        let file_name = if self.sess.target.arch == "bpf" {
-            let file_name = caller.file.name.prefer_remapped().to_string_lossy();
-            let mut path = Path::new(&file_name);
-            let components = path.components().collect::<Vec<_>>();
-            let len = components.len();
-            let mut buf = PathBuf::new();
-            if len > 3 {
-                buf.push(components[len - 3].as_os_str());
-                buf.push(components[len - 2].as_os_str());
-                buf.push(components[len - 1].as_os_str());
-                path = buf.as_path();
-            }
-            if let Some(path_str) = path.to_str() {
-                Symbol::intern(&path_str)
-            } else {
-                Symbol::intern(&file_name)
-            }
-        } else {
+        self.const_caller_location(
             Symbol::intern(
                 &caller
                     .file
                     .name
                     .for_scope(self.sess, RemapPathScopeComponents::MACRO)
-                    .to_string_lossy())
-        };
-
-        self.const_caller_location(
-            file_name,
+                    .to_string_lossy(),
+            ),
             caller.line as u32,
             caller.col_display as u32 + 1,
         )

compiler/rustc_target/src/callconv/sbf.rs

@@ -1,5 +1,5 @@
 // see https://github.com/llvm/llvm-project/blob/main/llvm/lib/Target/BPF/BPFCallingConv.td
-use crate::abi::call::{ArgAbi, FnAbi, Reg, Uniform};
+use crate::callconv::{ArgAbi, FnAbi, Reg, Uniform};
 
 fn classify_ret<Ty>(ret: &mut ArgAbi<'_, Ty>) {
     let size = ret.layout.size;

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

@@ -1,4 +1,4 @@
-use crate::abi::Endian;
+use rustc_abi::Endian;
 use crate::spec::{Cc, cvs, LinkerFlavor, Lld, PanicStrategy, Target, TargetOptions, SymbolVisibility};
 
 const V0_LINKER_SCRIPT: &str = r"
@@ -108,7 +108,7 @@ pub(crate) fn opts(version: &'static str) -> TargetOptions {
 
     TargetOptions {
         allow_asm: true,
-        c_int_width: "64".into(),
+        c_int_width: 64,
         default_visibility: Some(SymbolVisibility::Hidden),
         dll_prefix: "".into(),
         dynamic_linking: true,