ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-08 16:48:18 +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
+8 -4
View File
@@ -4525,7 +4525,7 @@ lbValue lb_const_value(lbModule *m, Type *type, ExactValue value) {
ast_node(cl, CompoundLit, value.value_compound);
Type *elem_type = type->Array.elem;
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);
}
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);
Type *elem_type = type->EnumeratedArray.elem;
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);
}
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) {
return lb_const_nil(m, original_type);
}
GB_ASSERT(elem_type_can_be_constant(elem_type));
isize total_elem_count = type->SimdVector.count;
LLVMValueRef *values = gb_alloc_array(heap_allocator(), LLVMValueRef, total_elem_count);
@@ -4759,10 +4760,11 @@ lbValue lb_const_value(lbModule *m, Type *type, ExactValue value) {
Selection sel = lookup_field(type, name, false);
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;
visited[offset+f->Variable.field_index] = true;
}
}
} else {
for_array(i, cl->elems) {
Entity *f = type->Struct.fields[i];
@@ -4771,11 +4773,13 @@ lbValue lb_const_value(lbModule *m, Type *type, ExactValue value) {
if (tav.mode != Addressing_Invalid) {
val = tav.value;
}
if (elem_type_can_be_constant(f->type)) {
values[offset+f->Variable.field_index] = lb_const_value(m, f->type, val).value;
visited[offset+f->Variable.field_index] = true;
}
}
}
}
for (isize i = 0; i < type->Struct.fields.count; i++) {
if (!visited[offset+i]) {
@@ -11694,7 +11698,7 @@ void lb_generate_code(lbGenerator *gen) {
if (build_context.keep_temp_files) {
TIME_SECTION("LLVM Print Module to File");
LLVMPrintModuleToFile(mod, cast(char const *)filepath_ll.text, &llvm_error);
exit(1);
// exit(1);
}
LLVMDIBuilderFinalize(m->debug_builder);
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) {
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 true;