MISC bugfixes

Author: FractalFir

cilly/src/v2/asm.rs

@@ -494,9 +494,14 @@ impl Assembly {
     ) -> Interned<StaticFieldDesc> {
         let main_module = self.main_module();
         let node = node.into_idx(self);
-        let name = format!("n_{}", encode(node.as_bimap_index().get() as u64));
+
         let sig = self.sig([], Type::Void);
         let tpe = self[node].clone().typecheck(sig, &[], self).unwrap();
+        let name = format!(
+            "n_{}_{}",
+            encode(node.as_bimap_index().get() as u64),
+            encode(self.alloc_type(tpe).as_bimap_index().get() as u64)
+        );
         let name_idx = self.alloc_string(name.clone());
         let field = StaticFieldDesc::new(*main_module, name_idx, tpe);
         let field = self.alloc_sfld(field);

src/terminator/call.rs

@@ -9,7 +9,7 @@ use crate::{
 };
 use cilly::{
     call, call_virt,
-    cil_node::{V1Node, CallOpArgs},
+    cil_node::{CallOpArgs, V1Node},
     cil_root::CILRoot,
     cilnode::{IsPure, MethodKind},
     conv_usize, ld_field, ClassRef, Const, FieldDesc, FnSig, Int, IntoAsmIndex,
@@ -443,7 +443,6 @@ pub fn call_inner<'tcx>(
 
     let function_name = function_name(ctx.tcx().symbol_name(instance));
     if matches!(instance.def, InstanceKind::Intrinsic(_)) {
-        eprintln!("{:?} {:?}", instance, instance.def);
         return super::intrinsics::handle_intrinsic(
             &function_name,
             args,