Merge pull request #293 from Pivot-Studio/Chronostasys/issue292

refactor: better impl

Author: Chronostasys

rust-toolchain

@@ -1 +1 @@
-1.65.0
+1.69.0

src/ast/builder/llvmbuilder.rs

@@ -32,7 +32,11 @@ use inkwell::{
 use llvm_sys::{core::LLVMStructSetBody, prelude::LLVMTypeRef};
 use rustc_hash::FxHashMap;
 
-use crate::ast::{diag::PLDiag, pass::run_immix_pass, pltype::ClosureType};
+use crate::ast::{
+    diag::PLDiag,
+    pass::run_immix_pass,
+    pltype::{ClosureType, TraitImplAble},
+};
 
 use super::{
     super::{
@@ -445,7 +449,9 @@ impl<'a, 'ctx> LLVMBuilder<'a, 'ctx> {
         if let Some(f) = self.module.get_function(fname) {
             return f;
         }
-        let f = self.module.add_function(fname, ftp, None);
+        let f = self
+            .module
+            .add_function(fname, ftp, Some(Linkage::LinkOnceAny));
         // the array is a struct, the first field is the visit function, the second field is the real array
         // array struct it self is the first parameter
         // the other three parameters are the visit function for different type
@@ -585,7 +591,7 @@ impl<'a, 'ctx> LLVMBuilder<'a, 'ctx> {
         st: &STType,
     ) -> FunctionValue<'ctx> {
         let ptrtp = p.get_type();
-        let llvmname = st.get_st_full_name() + "@";
+        let llvmname = st.get_full_name() + "@";
         if let Some(v) = self.module.get_function(&llvmname) {
             return v;
         }
@@ -879,17 +885,17 @@ impl<'a, 'ctx> LLVMBuilder<'a, 'ctx> {
             PLType::Struct(x) | PLType::Trait(x) => {
                 let sttp = self.struct_type(x, ctx);
                 // 若已经生成过，直接查表返回
-                if RefCell::borrow(&self.ditypes).contains_key(&x.get_st_full_name()) {
+                if RefCell::borrow(&self.ditypes).contains_key(&x.get_full_name()) {
                     return Some(
                         *RefCell::borrow(&self.ditypes)
-                            .get(&x.get_st_full_name())
+                            .get(&x.get_full_name())
                             .unwrap(),
                     );
                 }
                 // 生成占位符，为循环引用做准备
                 self.ditypes_placeholder
                     .borrow_mut()
-                    .insert(x.get_st_full_name(), RefCell::new(vec![]));
+                    .insert(x.get_full_name(), RefCell::new(vec![]));
                 let mut m = vec![];
                 ctx.run_in_type_mod(x, |ctx, x| {
                     m = x
@@ -922,7 +928,7 @@ impl<'a, 'ctx> LLVMBuilder<'a, 'ctx> {
                 let members = self
                     .ditypes_placeholder
                     .borrow_mut()
-                    .remove(&x.get_st_full_name())
+                    .remove(&x.get_full_name())
                     .unwrap();
                 // 替换循环引用生成的占位符
                 for m in members.borrow().iter() {
@@ -935,7 +941,7 @@ impl<'a, 'ctx> LLVMBuilder<'a, 'ctx> {
                     );
                     unsafe { self.dibuilder.replace_placeholder_derived_type(*m, realtp) };
                 }
-                self.ditypes.borrow_mut().insert(x.get_st_full_name(), st);
+                self.ditypes.borrow_mut().insert(x.get_full_name(), st);
                 Some(st)
             }
             PLType::Primitive(pt) => {
@@ -1141,7 +1147,7 @@ impl<'a, 'ctx> LLVMBuilder<'a, 'ctx> {
     }
 
     fn struct_type(&self, pltp: &STType, ctx: &mut Ctx<'a>) -> StructType<'ctx> {
-        let st = self.module.get_struct_type(&pltp.get_st_full_name());
+        let st = self.module.get_struct_type(&pltp.get_full_name());
         if let Some(st) = st {
             return st;
         }
@@ -1150,7 +1156,7 @@ impl<'a, 'ctx> LLVMBuilder<'a, 'ctx> {
             let fields = &self.get_fields(pltp, ctx);
             return self.context.struct_type(fields, false);
         }
-        let st = self.context.opaque_struct_type(&pltp.get_st_full_name());
+        let st = self.context.opaque_struct_type(&pltp.get_full_name());
         st.set_body(&self.get_fields(pltp, ctx), false);
         st
     }
@@ -2006,9 +2012,9 @@ impl<'a, 'ctx> IRBuilder<'a, 'ctx> for LLVMBuilder<'a, 'ctx> {
         let ptrtp = self.struct_type(v, ctx).ptr_type(AddressSpace::default());
         let ty = ptrtp.get_element_type().into_struct_type();
         let ftp = self.mark_fn_tp(ptrtp);
-        let f = self
-            .module
-            .add_function(&(v.get_st_full_name() + "@"), ftp, None);
+        let f =
+            self.module
+                .add_function(&(v.get_full_name() + "@"), ftp, Some(Linkage::LinkOnceAny));
         let bb = self.context.append_basic_block(f, "entry");
         self.builder.position_at_end(bb);
         let fieldn = ty.count_fields();