Fixed some typecheck errors

Author: FractalFir

cilly/src/v2/typecheck.rs

@@ -236,7 +236,8 @@ pub fn display_typecheck_err(
 ) {
     eprintln!("{}", typecheck_err_to_string(root_idx, asm, sig, locals))
 }
-fn display_node(
+#[doc(hidden)]
+pub fn display_node(
     nodeidx: Interned<CILNode>,
     asm: &mut Assembly,
     sig: Interned<FnSig>,

rustc_codgen_clr_operand/src/constant.rs

@@ -1,4 +1,5 @@
 use core::f16;
+use std::collections::HashSet;
 
 use cilly::{
     Assembly, CILNode, ClassRef, Const, Float, Int, Interned, IntoAsmIndex, MethodRef,
@@ -335,7 +336,9 @@ fn load_const_scalar<'tcx>(
             if matches!(scalar_type, Type::Ptr(_) | Type::FnPtr(_)) {
                 return ctx.cast_ptr(ptr, const_type_idx);
             }
-            return ctx.cast_ptr(ptr, Int::U8);
+            let src_ptr = ctx.nptr(Int::U8);
+            let ptr = ctx.cast_ptr(ptr, Int::U8);
+            return ctx.transmute_on_stack(src_ptr, scalar_type, ptr);
         }
     };
 
@@ -352,7 +355,11 @@ fn load_const_scalar<'tcx>(
                 let val = ctx.alloc_node(Const::USize(
                     u64::try_from(scalar_u128).expect("pointers must be smaller than 2^64"),
                 ));
-                ctx.cast_ptr(val, scalar_type)
+                let const_type = scalar_ty
+                    .builtin_deref(true)
+                    .map(|ty| ctx.type_from_cache(ty))
+                    .unwrap_or(Int::USize.into());
+                ctx.cast_ptr(val, const_type)
             }
         }
         TyKind::Tuple(elements) => {

rustc_codgen_clr_operand/src/static_data.rs

@@ -178,9 +178,9 @@ pub fn add_allocation(
             }
             let tpe = ctx[tpe].clone();
             ctx.add_static(tpe, &*alloc_name, false, main_module_id, None, false);
-            let uint8_ptr = ctx.nptr(Int::U8);
+
             let ptr = ctx.static_addr(field_desc);
-            let ptr = ctx.cast_ptr(ptr, uint8_ptr);
+            let ptr = ctx.cast_ptr(ptr, Int::U8);
 
             let initialzer: MethodDefIdx =
                 allocation_initializer_method(const_allocation, &alloc_name, ctx, ptr.into(), true);
@@ -189,7 +189,7 @@ pub fn add_allocation(
             let root = ctx.alloc_root(cilly::CILRoot::call(*initialzer, []));
             ctx.add_cctor(&[root]);
 
-            (ctx.static_addr(field_desc))
+            ctx.static_addr(field_desc)
         }
     }
 }