| ... | ... | @@ -1950,6 +1950,12 @@ static Error resolve_union_alignment(CodeGen *g, ZigType *union_type) { |
| 1950 | 1950 | } |
| 1951 | 1951 | } else if (packed) { |
| 1952 | 1952 | field->align = 1; |
| 1953 | } else if (field->type_entry != nullptr) { |
| 1954 | if ((err = type_resolve(g, field->type_entry, ResolveStatusAlignmentKnown))) { |
| 1955 | union_type->data.unionation.resolve_status = ResolveStatusInvalid; |
| 1956 | return err; |
| 1957 | } |
| 1958 | field->align = field->type_entry->abi_align; |
| 1953 | 1959 | } else { |
| 1954 | 1960 | if ((err = type_val_resolve_abi_align(g, field->type_val, &field->align))) { |
| 1955 | 1961 | union_type->data.unionation.resolve_status = ResolveStatusInvalid; |
| ... | ... | @@ -2040,12 +2046,14 @@ static Error resolve_union_type(CodeGen *g, ZigType *union_type) { |
| 2040 | 2046 | AstNode *field_source_node = decl_node->data.container_decl.fields.at(i); |
| 2041 | 2047 | TypeUnionField *union_field = &union_type->data.unionation.fields[i]; |
| 2042 | 2048 | |
| 2043 | | if ((err = ir_resolve_lazy(g, field_source_node, union_field->type_val))) { |
| 2044 | | union_type->data.unionation.resolve_status = ResolveStatusInvalid; |
| 2045 | | return err; |
| 2049 | if (union_field->type_entry == nullptr) { |
| 2050 | if ((err = ir_resolve_lazy(g, field_source_node, union_field->type_val))) { |
| 2051 | union_type->data.unionation.resolve_status = ResolveStatusInvalid; |
| 2052 | return err; |
| 2053 | } |
| 2054 | union_field->type_entry = union_field->type_val->data.x_type; |
| 2046 | 2055 | } |
| 2047 | | ZigType *field_type = union_field->type_val->data.x_type; |
| 2048 | | union_field->type_entry = field_type; |
| 2056 | ZigType *field_type = union_field->type_entry; |
| 2049 | 2057 | |
| 2050 | 2058 | if ((err = type_resolve(g, field_type, ResolveStatusSizeKnown))) { |
| 2051 | 2059 | union_type->data.unionation.resolve_status = ResolveStatusInvalid; |
| ... | ... | @@ -4999,7 +5007,11 @@ OnePossibleValue type_has_one_possible_value(CodeGen *g, ZigType *type_entry) { |
| 4999 | 5007 | case ZigTypeIdUnion: |
| 5000 | 5008 | if (type_entry->data.unionation.src_field_count > 1) |
| 5001 | 5009 | return OnePossibleValueNo; |
| 5002 | | return type_has_one_possible_value(g, type_entry->data.unionation.fields[0].type_entry); |
| 5010 | TypeUnionField *only_field = &type_entry->data.unionation.fields[0]; |
| 5011 | if (only_field->type_entry != nullptr) { |
| 5012 | return type_has_one_possible_value(g, only_field->type_entry); |
| 5013 | } |
| 5014 | return type_val_resolve_has_one_possible_value(g, only_field->type_val); |
| 5003 | 5015 | } |
| 5004 | 5016 | zig_unreachable(); |
| 5005 | 5017 | } |
Andrew Kelley <andrew@ziglang.org> 2019-08-25 11:42:19-04:00