Eliminate some errors/warnings following rebase

Author: smoelius

src/emit/stylus/mod.rs

@@ -36,17 +36,12 @@ impl StylusTarget {
         );
 
         let args = bin.module.add_global(
-            bin.context.i8_type().ptr_type(AddressSpace::default()),
+            bin.context.ptr_type(AddressSpace::default()),
             Some(AddressSpace::default()),
             "args",
         );
         args.set_linkage(Linkage::Internal);
-        args.set_initializer(
-            &bin.context
-                .i8_type()
-                .ptr_type(AddressSpace::default())
-                .get_undef(),
-        );
+        args.set_initializer(&bin.context.ptr_type(AddressSpace::default()).get_undef());
 
         bin.args = Some(args);
 
@@ -160,9 +155,9 @@ impl StylusTarget {
 
     fn declare_externals(&self, bin: &Binary) {
         let ctx = bin.context;
-        let u8_ptr = ctx.i8_type().ptr_type(AddressSpace::default()).into();
+        let u8_ptr = ctx.ptr_type(AddressSpace::default()).into();
         let u16_val = ctx.i16_type().into();
-        let u32_ptr = ctx.i32_type().ptr_type(AddressSpace::default()).into();
+        let u32_ptr = ctx.ptr_type(AddressSpace::default()).into();
         let u32_val = ctx.i32_type().into();
         let u64_val = ctx.i64_type().into();
 

src/emit/stylus/storage.rs

@@ -170,7 +170,7 @@ impl StorageSlot for StylusTarget {
                         .builder
                         .build_int_to_ptr(
                             bin.context.i32_type().const_all_ones(),
-                            bin.context.i8_type().ptr_type(AddressSpace::default()),
+                            bin.context.ptr_type(AddressSpace::default()),
                             "invalid",
                         )
                         .unwrap();
@@ -309,12 +309,7 @@ impl StorageSlot for StylusTarget {
                 let ret = self.get_storage_type_int(bin, function, slot_ptr, ptr_ty, &storage_type);
 
                 bin.builder
-                    .build_int_to_ptr(
-                        ret,
-                        bin.llvm_type(ty.deref_any())
-                            .ptr_type(AddressSpace::default()),
-                        "",
-                    )
+                    .build_int_to_ptr(ret, bin.context.ptr_type(AddressSpace::default()), "")
                     .unwrap()
                     .into()
             }
@@ -400,8 +395,7 @@ impl StorageSlot for StylusTarget {
                             if elem_ty.is_reference_type(bin.ns)
                                 && !elem_ty.deref_memory().is_fixed_reference_type(bin.ns)
                             {
-                                let load_ty =
-                                    bin.llvm_type(elem_ty).ptr_type(AddressSpace::default());
+                                let load_ty = bin.context.ptr_type(AddressSpace::default());
                                 elem = bin
                                     .builder
                                     .build_load(load_ty, elem, "")
@@ -619,7 +613,7 @@ impl StorageSlot for StylusTarget {
                     if field.ty.is_reference_type(bin.ns)
                         && !field.ty.is_fixed_reference_type(bin.ns)
                     {
-                        let load_ty = bin.llvm_type(&field.ty).ptr_type(AddressSpace::default());
+                        let load_ty = bin.context.ptr_type(AddressSpace::default());
                         elem = bin
                             .builder
                             .build_load(load_ty, elem, field.name_as_str())

src/emit/stylus/target.rs

@@ -423,7 +423,7 @@ impl<'a> TargetRuntime<'a> for StylusTarget {
             .builder
             .build_pointer_cast(
                 chunk_ptr,
-                bin.context.i8_type().ptr_type(AddressSpace::default()),
+                bin.context.ptr_type(AddressSpace::default()),
                 "chunk_ptr_as_byte_ptr",
             )
             .unwrap();
@@ -545,7 +545,7 @@ impl<'a> TargetRuntime<'a> for StylusTarget {
             .builder
             .build_pointer_cast(
                 chunk_ptr,
-                bin.context.i8_type().ptr_type(AddressSpace::default()),
+                bin.context.ptr_type(AddressSpace::default()),
                 "chunk_ptr_as_byte_ptr",
             )
             .unwrap();
@@ -643,7 +643,7 @@ impl<'a> TargetRuntime<'a> for StylusTarget {
     fn return_code<'b>(&self, bin: &'b Binary, ret: IntValue<'b>) {
         emit_context!(bin);
 
-        self.assert_failure(bin, byte_ptr!().const_zero(), i32_zero!());
+        self.assert_failure(bin, ptr!().const_zero(), i32_zero!());
     }
 
     /// Return failure without any result
@@ -997,7 +997,7 @@ impl<'a> TargetRuntime<'a> for StylusTarget {
                 let args = bin
                     .builder
                     .build_load(
-                        bin.context.i8_type().ptr_type(AddressSpace::default()),
+                        bin.context.ptr_type(AddressSpace::default()),
                         bin.args.unwrap().as_pointer_value(),
                         "args",
                     )
@@ -1226,7 +1226,7 @@ impl<'a> TargetRuntime<'a> for StylusTarget {
 
             topic_buf
         } else {
-            byte_ptr!().const_null()
+            ptr!().const_null()
         };
 
         call!(

tests/lir_tests/helpers.rs

@@ -104,7 +104,7 @@ pub(crate) fn identifier(id: usize) -> Operand {
     }
 }
 
-pub fn new_printer(v: &Vartable) -> Printer {
+pub fn new_printer(v: &Vartable) -> Printer<'_> {
     Printer::new(v)
 }
 

tests/solana.rs

@@ -1474,7 +1474,7 @@ impl VirtualMachine {
         res
     }
 
-    fn function(&mut self, name: &str) -> VmFunction {
+    fn function(&mut self, name: &str) -> VmFunction<'_, '_> {
         let idx = if let Some((idx, _)) = self.stack[0]
             .idl
             .as_ref()