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

Fix Assertion failure in ir_print_exact_value #620

Browse Source
This commit is contained in:
gingerBill
2020-05-14 00:34:27 +01:00
parent f661d34049
commit cd4403be0c
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/check_expr.cpp
View File

@@ -8168,16 +8168,18 @@ ExprKind check_expr_base_internal(CheckerContext *c, Operand *o, Ast *node, Type
}
fields_visited[sel.index[0]] = true;
check_expr_or_type(c, o, fv->value, field->type);
Operand o = {};
check_expr_or_type(c, &o, fv->value, field->type);
if (is_type_any(field->type) || is_type_union(field->type) || is_type_raw_union(field->type) || is_type_typeid(field->type)) {
is_constant = false;
}
if (is_constant) {
is_constant = o->mode == Addressing_Constant;
is_constant = o.mode == Addressing_Constant;
}
check_assignment(c, o, field->type, str_lit("structure literal"));
check_assignment(c, &o, field->type, str_lit("structure literal"));
}
} else {
bool seen_field_value = false;
@@ -8194,7 +8196,7 @@ ExprKind check_expr_base_internal(CheckerContext *c, Operand *o, Ast *node, Type
continue;
}
if (index >= field_count) {
error(o->expr, "Too many values in structure literal, expected %td, got %td", field_count, cl->elems.count);
error(elem, "Too many values in structure literal, expected %td, got %td", field_count, cl->elems.count);
break;
}
@@ -8202,16 +8204,17 @@ ExprKind check_expr_base_internal(CheckerContext *c, Operand *o, Ast *node, Type
field = t->Struct.fields[index];
}
check_expr_or_type(c, o, elem, field->type);
Operand o = {};
check_expr_or_type(c, &o, elem, field->type);
if (is_type_any(field->type) || is_type_union(field->type) || is_type_raw_union(field->type) || is_type_typeid(field->type)) {
is_constant = false;
}
if (is_constant) {
is_constant = o->mode == Addressing_Constant;
is_constant = o.mode == Addressing_Constant;
}
check_assignment(c, o, field->type, str_lit("structure literal"));
check_assignment(c, &o, field->type, str_lit("structure literal"));
}
if (cl->elems.count < field_count) {
if (min_field_count < field_count) {

11
src/ir_print.cpp
View File

@@ -1200,8 +1200,8 @@ void ir_print_exact_value(irFileBuffer *f, irModule *m, ExactValue value, Type *
Selection sel = lookup_field(type, name, false);
Entity *f = type->Struct.fields[sel.index[0]];
values[f->Variable.field_index] = tav.value;
visited[f->Variable.field_index] = true;
values[f->Variable.field_src_index] = tav.value;
visited[f->Variable.field_src_index] = true;
}
} else {
for_array(i, cl->elems) {
@@ -1211,8 +1211,8 @@ void ir_print_exact_value(irFileBuffer *f, irModule *m, ExactValue value, Type *
if (tav.mode != Addressing_Invalid) {
val = tav.value;
}
values[f->Variable.field_index] = val;
visited[f->Variable.field_index] = true;
values[f->Variable.field_src_index] = val;
visited[f->Variable.field_src_index] = true;
}
}
}
@@ -1231,7 +1231,8 @@ void ir_print_exact_value(irFileBuffer *f, irModule *m, ExactValue value, Type *
for (isize i = 0; i < value_count; i++) {
if (i > 0) ir_write_string(f, str_lit(", "));
Entity *e = type->Struct.fields[i];
ir_print_compound_element(f, m, values[i], e->type);
GB_ASSERT(e->kind == Entity_Variable);
ir_print_compound_element(f, m, values[e->Variable.field_src_index], e->type);
}