fix: union type scope bug

Pivot-Studio · Dec 18, 2024 · 1ac1b1b · 1ac1b1b
1 parent 3f2861c
commit 1ac1b1b
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 18 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -98,9 +98,9 @@ thread = ["threadpool"]
 members = ["internal_macro", "vm", "pl_linker", "immix", "kagari"]
 
 [profile.release]
-lto = "thin"
+lto = "fat"
 opt-level = 3
-debug = "line-tables-only"
+# debug = "line-tables-only"
 
 [profile.bench]
 opt-level = 3
@@ -127,3 +127,8 @@ vergen = { version = "8.3.1", features = [
     "rustc",
     "si",
 ] }
+
+
+[profile.dev]
+overflow-checks = false
+debug-assertions = false
diff --git a/alloc.ll b/alloc.ll
@@ -19,11 +19,19 @@ declare noalias void @DioGC__safepoint_ex(
 
 define noalias void @DioGC__safepoint(
     i64 %rsp) {
-    call void @DioGC__safepoint_ex(i64 %rsp, ptr @gc_handle)
+    %collector_ptr = load ptr, ptr @gc_handle, align 8, !invariant.load !0
+    call void @DioGC__safepoint_ex(i64 %rsp, ptr %collector_ptr)
     ret void
 }
 
 
+declare noalias void @gc_set_handle(ptr %handle)
+
+define void @gc_thread_init() {
+    call void @gc_set_handle(ptr @gc_handle)
+    ret void
+}
+
 declare void @llvm.memset.p0.i64(ptr nocapture, i8, i64, i1) nounwind
 
 
@@ -43,7 +51,7 @@ entry:
     br i1 %size_gt_7936, label %call_slowpath, label %check_collector
 check_collector:
     ; Load collector from gc_handle
-    %collector_ptr = load ptr, ptr @gc_handle, align 8
+    %collector_ptr = load ptr, ptr @gc_handle, align 8, !invariant.load !0
 
     ; Check if collector_ptr is null
     %is_null = icmp eq ptr %collector_ptr, null
@@ -158,3 +166,4 @@ finish_fast_path_2:
 
 
 attributes #0 = { nounwind allockind("alloc") "gc-leaf-function" }
+!0 = !{}
diff --git a/immix b/immix
diff --git a/src/ast/ctx/cast.rs b/src/ast/ctx/cast.rs
@@ -288,7 +288,9 @@ impl<'a, 'ctx> Ctx<'a> {
         if let PLType::Union(u) = &*target_pltype.borrow() {
             let mut union_members = vec![];
             for tp in &u.sum_types {
-                let tp = tp.get_type(self, builder, true)?;
+                let tp = self.run_in_type_mod(u, |ctx,u|{
+                    tp.get_type(ctx, builder, true)
+                })?;
                 union_members.push(tp);
             }
             for (i, tp) in union_members.iter().enumerate() {
+2 −1		Cargo.toml
+71 −68		src/allocator/global_allocator.rs
+128 −0		src/allocator/global_freelist.rs
+1 −0		src/allocator/mod.rs
+51 −21		src/allocator/thread_local_allocator.rs
+13 −17		src/block.rs
+32 −2		src/c_api.rs
+21 −16		src/collector.rs
+1 −1		src/consts.rs
+27 −16		src/lib.rs