ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-03 22:28:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix untyped ternary string IR conversion

Browse Source
This commit is contained in:
gingerBill
2019-02-14 11:11:05 +00:00
parent 53d8216311
commit dbd0638853
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/mem/allocators.odin
+2
View File
@@ -381,6 +381,8 @@ small_stack_allocator_proc :: proc(allocator_data: rawptr, mode: Allocator_Mode,
return nil; return nil;
} }
alignment = clamp(alignment, 1, 8*size_of(Stack_Allocation_Header{}.padding)/2);
raw_alloc :: proc(s: ^Small_Stack, size, alignment: int) -> rawptr { raw_alloc :: proc(s: ^Small_Stack, size, alignment: int) -> rawptr {
curr_addr := uintptr(&s.data[0]) + uintptr(s.offset); curr_addr := uintptr(&s.data[0]) + uintptr(s.offset);
padding := calc_padding_with_header(curr_addr, uintptr(alignment), size_of(Small_Stack_Allocation_Header)); padding := calc_padding_with_header(curr_addr, uintptr(alignment), size_of(Small_Stack_Allocation_Header));
src/ir.cpp
+8 -1
View File
@@ -4644,6 +4644,7 @@ irValue *ir_emit_conv(irProcedure *proc, irValue *value, Type *t) {
} }
// bool <-> llvm bool // bool <-> llvm bool
if (is_type_boolean(src) && dst == t_llvm_bool) { if (is_type_boolean(src) && dst == t_llvm_bool) {
return ir_emit(proc, ir_instr_conv(proc, irConv_trunc, value, src_type, t)); return ir_emit(proc, ir_instr_conv(proc, irConv_trunc, value, src_type, t));
@@ -4906,7 +4907,13 @@ irValue *ir_emit_conv(irProcedure *proc, irValue *value, Type *t) {
return ir_emit_load(proc, result); return ir_emit_load(proc, result);
} }
if (is_type_untyped(src)) {
if (is_type_string(src) && is_type_string(dst)) {
irValue *result = ir_add_local_generated(proc, t, false);
ir_emit_store(proc, result, value);
return ir_emit_load(proc, result);
}
}
gb_printf_err("ir_emit_conv: src -> dst\n"); gb_printf_err("ir_emit_conv: src -> dst\n");
gb_printf_err("Not Identical %s != %s\n", type_to_string(src_type), type_to_string(t)); gb_printf_err("Not Identical %s != %s\n", type_to_string(src_type), type_to_string(t));