ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-06 15:48:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

LLVM API: Fix compound literals with constant parameters to union fields

Browse Source
This commit is contained in:
gingerBill
2020-04-25 14:45:34 +01:00
parent 9409f53a9b
commit f63b9806d2
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/llvm_backend.cpp
+12 -8
View File
@@ -4525,7 +4525,7 @@ lbValue lb_const_value(lbModule *m, Type *type, ExactValue value) {
ast_node(cl, CompoundLit, value.value_compound); ast_node(cl, CompoundLit, value.value_compound);
Type *elem_type = type->Array.elem; Type *elem_type = type->Array.elem;
isize elem_count = cl->elems.count; isize elem_count = cl->elems.count;
if (elem_count == 0) { if (elem_count == 0 || !elem_type_can_be_constant(elem_type)) {
return lb_const_nil(m, original_type); return lb_const_nil(m, original_type);
} }
if (cl->elems[0]->kind == Ast_FieldValue) { if (cl->elems[0]->kind == Ast_FieldValue) {
@@ -4614,7 +4614,7 @@ lbValue lb_const_value(lbModule *m, Type *type, ExactValue value) {
ast_node(cl, CompoundLit, value.value_compound); ast_node(cl, CompoundLit, value.value_compound);
Type *elem_type = type->EnumeratedArray.elem; Type *elem_type = type->EnumeratedArray.elem;
isize elem_count = cl->elems.count; isize elem_count = cl->elems.count;
if (elem_count == 0) { if (elem_count == 0 || !elem_type_can_be_constant(elem_type)) {
return lb_const_nil(m, original_type); return lb_const_nil(m, original_type);
} }
if (cl->elems[0]->kind == Ast_FieldValue) { if (cl->elems[0]->kind == Ast_FieldValue) {
@@ -4711,6 +4711,7 @@ lbValue lb_const_value(lbModule *m, Type *type, ExactValue value) {
if (elem_count == 0) { if (elem_count == 0) {
return lb_const_nil(m, original_type); return lb_const_nil(m, original_type);
} }
GB_ASSERT(elem_type_can_be_constant(elem_type));
isize total_elem_count = type->SimdVector.count; isize total_elem_count = type->SimdVector.count;
LLVMValueRef *values = gb_alloc_array(heap_allocator(), LLVMValueRef, total_elem_count); LLVMValueRef *values = gb_alloc_array(heap_allocator(), LLVMValueRef, total_elem_count);
@@ -4759,9 +4760,10 @@ lbValue lb_const_value(lbModule *m, Type *type, ExactValue value) {
Selection sel = lookup_field(type, name, false); Selection sel = lookup_field(type, name, false);
Entity *f = type->Struct.fields[sel.index[0]]; Entity *f = type->Struct.fields[sel.index[0]];
if (elem_type_can_be_constant(f->type)) {
values[offset+f->Variable.field_index] = lb_const_value(m, f->type, tav.value).value; values[offset+f->Variable.field_index] = lb_const_value(m, f->type, tav.value).value;
visited[offset+f->Variable.field_index] = true; visited[offset+f->Variable.field_index] = true;
}
} }
} else { } else {
for_array(i, cl->elems) { for_array(i, cl->elems) {
@@ -4771,8 +4773,10 @@ lbValue lb_const_value(lbModule *m, Type *type, ExactValue value) {
if (tav.mode != Addressing_Invalid) { if (tav.mode != Addressing_Invalid) {
val = tav.value; val = tav.value;
} }
values[offset+f->Variable.field_index] = lb_const_value(m, f->type, val).value; if (elem_type_can_be_constant(f->type)) {
visited[offset+f->Variable.field_index] = true; values[offset+f->Variable.field_index] = lb_const_value(m, f->type, val).value;
visited[offset+f->Variable.field_index] = true;
}
} }
} }
} }
@@ -11694,7 +11698,7 @@ void lb_generate_code(lbGenerator *gen) {
if (build_context.keep_temp_files) { if (build_context.keep_temp_files) {
TIME_SECTION("LLVM Print Module to File"); TIME_SECTION("LLVM Print Module to File");
LLVMPrintModuleToFile(mod, cast(char const *)filepath_ll.text, &llvm_error); LLVMPrintModuleToFile(mod, cast(char const *)filepath_ll.text, &llvm_error);
exit(1); // exit(1);
} }
LLVMDIBuilderFinalize(m->debug_builder); LLVMDIBuilderFinalize(m->debug_builder);
LLVMVerifyModule(mod, LLVMAbortProcessAction, &llvm_error); LLVMVerifyModule(mod, LLVMAbortProcessAction, &llvm_error);
src/types.cpp
+1 -1
View File
@@ -1742,7 +1742,7 @@ bool elem_type_can_be_constant(Type *t) {
if (t == t_invalid) { if (t == t_invalid) {
return false; return false;
} }
if (is_type_any(t) || is_type_union(t)) { if (is_type_any(t) || is_type_union(t) || is_type_raw_union(t)) {
return false; return false;
} }
return true; return true;