mirror of
https://github.com/c3lang/c3c.git
synced 2026-02-27 20:11:17 +00:00
Allocator uses protocols. Fix bug where it was not possible to pass a ref variable as a ref variable. Correct codegen for !anyptr.
This commit is contained in:
committed by
Christoffer Lerno
parent
54f32ed71b
commit
89d4c2cab7
@@ -98,7 +98,7 @@ fn void! TextTemplate.init(&self, String template, String tag_start = "{{", Stri
|
||||
|
||||
fn void! TextTemplate.free(&self)
|
||||
{
|
||||
self.allocator.free(self.tags)!;
|
||||
self.allocator.free(self.tags);
|
||||
*self = {};
|
||||
}
|
||||
|
||||
@@ -186,11 +186,12 @@ entry:
|
||||
%ft = alloca %TextTemplate, align 8
|
||||
%error_var = alloca i64, align 8
|
||||
%indirectarg = alloca %"char[]", align 8
|
||||
%error_var1 = alloca i64, align 8
|
||||
%indirectarg1 = alloca %"any*", align 8
|
||||
%error_var2 = alloca i64, align 8
|
||||
%varargslots = alloca [1 x %"any*"], align 16
|
||||
%indirectarg5 = alloca %"any*[]", align 8
|
||||
%indirectarg6 = alloca %"any*[]", align 8
|
||||
store %"char[]" { ptr @.str, i64 21 }, ptr %foo_tmpl, align 8
|
||||
call void @llvm.memset.p0.i64(ptr align 8 %ft, i8 0, i64 64, i1 false)
|
||||
call void @llvm.memset.p0.i64(ptr align 8 %ft, i8 0, i64 72, i1 false)
|
||||
%0 = load ptr, ptr @std.core.mem.thread_temp_allocator, align 8
|
||||
%not = icmp eq ptr %0, null
|
||||
br i1 %not, label %if.then, label %if.exit
|
||||
@@ -201,51 +202,54 @@ if.then: ; preds = %entry
|
||||
|
||||
if.exit: ; preds = %if.then, %entry
|
||||
%1 = load ptr, ptr @std.core.mem.thread_temp_allocator, align 8
|
||||
%2 = getelementptr inbounds %"char[]", ptr %foo_tmpl, i32 0, i32 0
|
||||
%lo = load ptr, ptr %2, align 8
|
||||
%3 = getelementptr inbounds %"char[]", ptr %foo_tmpl, i32 0, i32 1
|
||||
%hi = load i64, ptr %3, align 8
|
||||
%2 = insertvalue %"any*" undef, ptr %1, 0
|
||||
%3 = insertvalue %"any*" %2, i64 ptrtoint (ptr @"$ct.std.core.mem.allocator.TempAllocator" to i64), 1
|
||||
%4 = getelementptr inbounds %"char[]", ptr %foo_tmpl, i32 0, i32 0
|
||||
%lo = load ptr, ptr %4, align 8
|
||||
%5 = getelementptr inbounds %"char[]", ptr %foo_tmpl, i32 0, i32 1
|
||||
%hi = load i64, ptr %5, align 8
|
||||
store %"char[]" { ptr @.str.2, i64 2 }, ptr %indirectarg, align 8
|
||||
%4 = call i64 @"abc$text_test.Foo$.TextTemplate.init"(ptr %ft, ptr %lo, i64 %hi, ptr @.str.1, i64 2, ptr byval(%"char[]") align 8 %indirectarg, ptr %1)
|
||||
%not_err = icmp eq i64 %4, 0
|
||||
%5 = call i1 @llvm.expect.i1(i1 %not_err, i1 true)
|
||||
br i1 %5, label %after_check, label %assign_optional
|
||||
store %"any*" %3, ptr %indirectarg1, align 8
|
||||
%6 = call i64 @"abc$text_test.Foo$.TextTemplate.init"(ptr %ft, ptr %lo, i64 %hi, ptr @.str.1, i64 2, ptr byval(%"char[]") align 8 %indirectarg, ptr byval(%"any*") align 8 %indirectarg1)
|
||||
%not_err = icmp eq i64 %6, 0
|
||||
%7 = call i1 @llvm.expect.i1(i1 %not_err, i1 true)
|
||||
br i1 %7, label %after_check, label %assign_optional
|
||||
|
||||
assign_optional: ; preds = %if.exit
|
||||
store i64 %4, ptr %error_var, align 8
|
||||
store i64 %6, ptr %error_var, align 8
|
||||
br label %guard_block
|
||||
|
||||
after_check: ; preds = %if.exit
|
||||
br label %noerr_block
|
||||
|
||||
guard_block: ; preds = %assign_optional
|
||||
%6 = load i64, ptr %error_var, align 8
|
||||
ret i64 %6
|
||||
%8 = load i64, ptr %error_var, align 8
|
||||
ret i64 %8
|
||||
|
||||
noerr_block: ; preds = %after_check
|
||||
%7 = call i64 @"abc$text_test.Foo$.TextTemplate.free"(ptr %ft)
|
||||
%not_err2 = icmp eq i64 %7, 0
|
||||
%8 = call i1 @llvm.expect.i1(i1 %not_err2, i1 true)
|
||||
br i1 %8, label %after_check4, label %assign_optional3
|
||||
%9 = call i64 @"abc$text_test.Foo$.TextTemplate.free"(ptr %ft)
|
||||
%not_err3 = icmp eq i64 %9, 0
|
||||
%10 = call i1 @llvm.expect.i1(i1 %not_err3, i1 true)
|
||||
br i1 %10, label %after_check5, label %assign_optional4
|
||||
|
||||
assign_optional3: ; preds = %noerr_block
|
||||
store i64 %7, ptr %error_var1, align 8
|
||||
assign_optional4: ; preds = %noerr_block
|
||||
store i64 %9, ptr %error_var2, align 8
|
||||
br label %panic_block
|
||||
|
||||
after_check4: ; preds = %noerr_block
|
||||
br label %noerr_block6
|
||||
after_check5: ; preds = %noerr_block
|
||||
br label %noerr_block7
|
||||
|
||||
panic_block: ; preds = %assign_optional3
|
||||
%9 = insertvalue %"any*" undef, ptr %error_var1, 0
|
||||
%10 = insertvalue %"any*" %9, i64 ptrtoint (ptr @"$ct.anyfault" to i64), 1
|
||||
%11 = getelementptr inbounds [1 x %"any*"], ptr %varargslots, i64 0, i64 0
|
||||
store %"any*" %10, ptr %11, align 16
|
||||
%12 = insertvalue %"any*[]" undef, ptr %varargslots, 0
|
||||
%"$$temp" = insertvalue %"any*[]" %12, i64 1, 1
|
||||
store %"any*[]" %"$$temp", ptr %indirectarg5, align 8
|
||||
call void @std.core.builtin.panicf(ptr @.panic_msg, i64 36, ptr @.file, i64 25, ptr @.func, i64 4, i32 173, ptr byval(%"any*[]") align 8 %indirectarg5)
|
||||
panic_block: ; preds = %assign_optional4
|
||||
%11 = insertvalue %"any*" undef, ptr %error_var2, 0
|
||||
%12 = insertvalue %"any*" %11, i64 ptrtoint (ptr @"$ct.anyfault" to i64), 1
|
||||
%13 = getelementptr inbounds [1 x %"any*"], ptr %varargslots, i64 0, i64 0
|
||||
store %"any*" %12, ptr %13, align 16
|
||||
%14 = insertvalue %"any*[]" undef, ptr %varargslots, 0
|
||||
%"$$temp" = insertvalue %"any*[]" %14, i64 1, 1
|
||||
store %"any*[]" %"$$temp", ptr %indirectarg6, align 8
|
||||
call void @std.core.builtin.panicf(ptr @.panic_msg, i64 36, ptr @.file, i64 25, ptr @.func, i64 4, i32 173, ptr byval(%"any*[]") align 8 %indirectarg6)
|
||||
unreachable
|
||||
|
||||
noerr_block6: ; preds = %after_check4
|
||||
noerr_block7: ; preds = %after_check5
|
||||
ret i64 0
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user