ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-06-26 07:25:00 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix Unable to initialize a typeid field in a struct literal #501

Browse Source
This commit is contained in:
gingerBill
2019-12-15 09:48:05 +00:00
parent b8c534eba9
commit e6f26b9931
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/check_expr.cpp
+3 -4
View File
@@ -7299,7 +7299,7 @@ ExprKind check_expr_base_internal(CheckerContext *c, Operand *o, Ast *node, Type
}
fields_visited[sel.index[0]] = true;
check_expr_with_type_hint(c, o, fv->value, field->type);
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_constant = false;
@@ -7308,7 +7308,6 @@ ExprKind check_expr_base_internal(CheckerContext *c, Operand *o, Ast *node, Type
is_constant = o->mode == Addressing_Constant;
}
check_assignment(c, o, field->type, str_lit("structure literal"));
}
} else {
@@ -7334,9 +7333,9 @@ ExprKind check_expr_base_internal(CheckerContext *c, Operand *o, Ast *node, Type
field = t->Struct.fields[index];
}
check_expr_with_type_hint(c, o, elem, field->type);
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)) {
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) {
src/ir.cpp
+3 -1
View File
@@ -8184,6 +8184,7 @@ irAddr ir_build_addr(irProcedure *proc, Ast *expr) {
Selection sel = lookup_field(bt, name, false);
index = sel.index[0];
elem = fv->value;
TypeAndValue tav = type_and_value_of_expr(elem);
} else {
TypeAndValue tav = type_and_value_of_expr(elem);
Selection sel = lookup_field_from_index(bt, st->fields[field_index]->Variable.field_src_index);
@@ -8192,12 +8193,13 @@ irAddr ir_build_addr(irProcedure *proc, Ast *expr) {
field = st->fields[index];
Type *ft = field->type;
if (!is_raw_union && ir_is_elem_const(proc->module, elem, ft)) {
if (!is_raw_union && !is_type_typeid(ft) && ir_is_elem_const(proc->module, elem, ft)) {
continue;
}
field_expr = ir_build_expr(proc, elem);
GB_ASSERT(ir_type(field_expr)->kind != Type_Tuple);
Type *fet = ir_type(field_expr);