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

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
+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);