mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-07-11 02:19:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6859 from Raykiru/master

Browse Source 
Fix: tuples are not handled properly in struct literals
This commit is contained in:
gingerBill
2026-06-19 16:08:16 +01:00
committed by GitHub
parent abbfe793e0 912a45769b
commit 604c6f85f1
2 changed files with 47 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/llvm_backend_const.cpp
View File

@@ -1967,19 +1967,31 @@ gb_internal lbValue lb_const_value(lbModule *m, Type *type, ExactValue value, Ty
}
}
} else {
isize multiple_return_offset = 0;
for_array(i, cl->elems) {
Entity *f = type->Struct.fields[i];
Entity *f = type->Struct.fields[i+multiple_return_offset];
TypeAndValue tav = cl->elems[i]->tav;
ExactValue val = {};
if (tav.mode != Addressing_Invalid) {
val = tav.value;
// INFO: dead code:
// ExactValue val = {};
// if (tav.mode != Addressing_Invalid) {
// val = tav.value;
// }
if (is_type_tuple(tav.type)){
multiple_return_offset += tav.type->Tuple.variables.count-1;
}
i32 index = field_remapping[f->Variable.field_index];
if (elem_type_can_be_constant(f->type)) {
lbValue value = lb_const_value(m, f->type, tav.value, tav.type, cc);
LLVMTypeRef value_type = LLVMTypeOf(value.value);
GB_ASSERT_MSG(lb_sizeof(value_type) == type_size_of(f->type), "%s vs %s", LLVMPrintTypeToString(value_type), type_to_string(f->type));
isize lb_sizeof_value_type = lb_sizeof(value_type);
isize type_size_of_f_type = type_size_of(f->type);
GB_ASSERT_MSG(lb_sizeof_value_type ==type_size_of_f_type, "%s vs %s", LLVMPrintTypeToString(value_type), type_to_string(f->type));
values[index] = value.value;
visited[index] = true;
}

30
tests/issues/test_issue_6853.odin Normal file
View File

@@ -0,0 +1,30 @@
package test_issues
import "core:testing"
@(test)
test_issue_6853 :: proc(t: ^testing.T) {
test_s :: struct {
a, b, c, d, e: u64,
}
expected := test_s{1, 2, 3, 4, 5}
case0 :: proc() -> (u64, u64) {return 1, 2}
test0 := test_s{case0(), 3, 4, 5}
testing.expect_value(t, test0, expected)
case1 :: proc() -> (u64, u64, u64) {return 1, 2, 3}
test1 := test_s{case1(), 4, 5}
testing.expect_value(t, test1, expected)
case2 :: proc() -> (u64, u64) {return 2, 3}
test2 := test_s{1, case2(), 4, 5}
testing.expect_value(t, test2, expected)
case3_1 :: proc() -> (u64, u64) {return 1, 2}
case3_2 :: proc() -> (u64, u64) {return 3, 4}
test3 := test_s{case3_1(), case3_2(), 5}
testing.expect_value(t, test3, expected)
}