authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2017-12-03 22:36:01-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2017-12-03 22:36:01-05:00
log5a8367e8924e809b1390796eb656633ea5e34a86
tree1eb50935a4dfb147349975875d5b00d391b75fcb
parent0ad1239522c70418990dc7b9da4e128da7cdd1d5

rename @EnumTagType to @TagType. add tests for union-enums

See #618

6 files changed, 109 insertions(+), 55 deletions(-)

src/all_types.hpp+5-5
...@@ -1266,7 +1266,7 @@ enum BuiltinFnId {...@@ -1266,7 +1266,7 @@ enum BuiltinFnId {
1266 BuiltinFnIdIntToPtr,1266 BuiltinFnIdIntToPtr,
1267 BuiltinFnIdPtrToInt,1267 BuiltinFnIdPtrToInt,
1268 BuiltinFnIdTagName,1268 BuiltinFnIdTagName,
1269 BuiltinFnIdEnumTagType,1269 BuiltinFnIdTagType,
1270 BuiltinFnIdFieldParentPtr,1270 BuiltinFnIdFieldParentPtr,
1271 BuiltinFnIdOffsetOf,1271 BuiltinFnIdOffsetOf,
1272 BuiltinFnIdInlineCall,1272 BuiltinFnIdInlineCall,
...@@ -1889,8 +1889,8 @@ enum IrInstructionId {...@@ -1889,8 +1889,8 @@ enum IrInstructionId {
1889 IrInstructionIdSetGlobalLinkage,1889 IrInstructionIdSetGlobalLinkage,
1890 IrInstructionIdDeclRef,1890 IrInstructionIdDeclRef,
1891 IrInstructionIdPanic,1891 IrInstructionIdPanic,
1892 IrInstructionIdEnumTagName,1892 IrInstructionIdTagName,
1893 IrInstructionIdEnumTagType,1893 IrInstructionIdTagType,
1894 IrInstructionIdFieldParentPtr,1894 IrInstructionIdFieldParentPtr,
1895 IrInstructionIdOffsetOf,1895 IrInstructionIdOffsetOf,
1896 IrInstructionIdTypeId,1896 IrInstructionIdTypeId,
...@@ -2652,13 +2652,13 @@ struct IrInstructionPanic {...@@ -2652,13 +2652,13 @@ struct IrInstructionPanic {
2652 IrInstruction *msg;2652 IrInstruction *msg;
2653};2653};
26542654
2655struct IrInstructionEnumTagName {2655struct IrInstructionTagName {
2656 IrInstruction base;2656 IrInstruction base;
26572657
2658 IrInstruction *target;2658 IrInstruction *target;
2659};2659};
26602660
2661struct IrInstructionEnumTagType {2661struct IrInstructionTagType {
2662 IrInstruction base;2662 IrInstruction base;
26632663
2664 IrInstruction *target;2664 IrInstruction *target;
src/codegen.cpp+5-5
...@@ -2717,7 +2717,7 @@ static LLVMValueRef ir_render_err_name(CodeGen *g, IrExecutable *executable, IrI...@@ -2717,7 +2717,7 @@ static LLVMValueRef ir_render_err_name(CodeGen *g, IrExecutable *executable, IrI
2717}2717}
27182718
2719static LLVMValueRef ir_render_enum_tag_name(CodeGen *g, IrExecutable *executable,2719static LLVMValueRef ir_render_enum_tag_name(CodeGen *g, IrExecutable *executable,
2720 IrInstructionEnumTagName *instruction)2720 IrInstructionTagName *instruction)
2721{2721{
2722 TypeTableEntry *enum_type = instruction->target->value.type;2722 TypeTableEntry *enum_type = instruction->target->value.type;
2723 assert(enum_type->id == TypeTableEntryIdEnum);2723 assert(enum_type->id == TypeTableEntryIdEnum);
...@@ -3484,7 +3484,7 @@ static LLVMValueRef ir_render_instruction(CodeGen *g, IrExecutable *executable,...@@ -3484,7 +3484,7 @@ static LLVMValueRef ir_render_instruction(CodeGen *g, IrExecutable *executable,
3484 case IrInstructionIdOpaqueType:3484 case IrInstructionIdOpaqueType:
3485 case IrInstructionIdSetAlignStack:3485 case IrInstructionIdSetAlignStack:
3486 case IrInstructionIdArgType:3486 case IrInstructionIdArgType:
3487 case IrInstructionIdEnumTagType:3487 case IrInstructionIdTagType:
3488 zig_unreachable();3488 zig_unreachable();
3489 case IrInstructionIdReturn:3489 case IrInstructionIdReturn:
3490 return ir_render_return(g, executable, (IrInstructionReturn *)instruction);3490 return ir_render_return(g, executable, (IrInstructionReturn *)instruction);
...@@ -3594,8 +3594,8 @@ static LLVMValueRef ir_render_instruction(CodeGen *g, IrExecutable *executable,...@@ -3594,8 +3594,8 @@ static LLVMValueRef ir_render_instruction(CodeGen *g, IrExecutable *executable,
3594 return ir_render_container_init_list(g, executable, (IrInstructionContainerInitList *)instruction);3594 return ir_render_container_init_list(g, executable, (IrInstructionContainerInitList *)instruction);
3595 case IrInstructionIdPanic:3595 case IrInstructionIdPanic:
3596 return ir_render_panic(g, executable, (IrInstructionPanic *)instruction);3596 return ir_render_panic(g, executable, (IrInstructionPanic *)instruction);
3597 case IrInstructionIdEnumTagName:3597 case IrInstructionIdTagName:
3598 return ir_render_enum_tag_name(g, executable, (IrInstructionEnumTagName *)instruction);3598 return ir_render_enum_tag_name(g, executable, (IrInstructionTagName *)instruction);
3599 case IrInstructionIdFieldParentPtr:3599 case IrInstructionIdFieldParentPtr:
3600 return ir_render_field_parent_ptr(g, executable, (IrInstructionFieldParentPtr *)instruction);3600 return ir_render_field_parent_ptr(g, executable, (IrInstructionFieldParentPtr *)instruction);
3601 case IrInstructionIdAlignCast:3601 case IrInstructionIdAlignCast:
...@@ -4963,7 +4963,7 @@ static void define_builtin_fns(CodeGen *g) {...@@ -4963,7 +4963,7 @@ static void define_builtin_fns(CodeGen *g) {
4963 create_builtin_fn(g, BuiltinFnIdIntToPtr, "intToPtr", 2);4963 create_builtin_fn(g, BuiltinFnIdIntToPtr, "intToPtr", 2);
4964 create_builtin_fn(g, BuiltinFnIdPtrToInt, "ptrToInt", 1);4964 create_builtin_fn(g, BuiltinFnIdPtrToInt, "ptrToInt", 1);
4965 create_builtin_fn(g, BuiltinFnIdTagName, "tagName", 1);4965 create_builtin_fn(g, BuiltinFnIdTagName, "tagName", 1);
4966 create_builtin_fn(g, BuiltinFnIdEnumTagType, "EnumTagType", 1);4966 create_builtin_fn(g, BuiltinFnIdTagType, "TagType", 1);
4967 create_builtin_fn(g, BuiltinFnIdFieldParentPtr, "fieldParentPtr", 3);4967 create_builtin_fn(g, BuiltinFnIdFieldParentPtr, "fieldParentPtr", 3);
4968 create_builtin_fn(g, BuiltinFnIdOffsetOf, "offsetOf", 2);4968 create_builtin_fn(g, BuiltinFnIdOffsetOf, "offsetOf", 2);
4969 create_builtin_fn(g, BuiltinFnIdDivExact, "divExact", 2);4969 create_builtin_fn(g, BuiltinFnIdDivExact, "divExact", 2);
src/ir.cpp+56-35
...@@ -539,12 +539,12 @@ static constexpr IrInstructionId ir_instruction_id(IrInstructionPanic *) {...@@ -539,12 +539,12 @@ static constexpr IrInstructionId ir_instruction_id(IrInstructionPanic *) {
539 return IrInstructionIdPanic;539 return IrInstructionIdPanic;
540}540}
541541
542static constexpr IrInstructionId ir_instruction_id(IrInstructionEnumTagName *) {542static constexpr IrInstructionId ir_instruction_id(IrInstructionTagName *) {
543 return IrInstructionIdEnumTagName;543 return IrInstructionIdTagName;
544}544}
545545
546static constexpr IrInstructionId ir_instruction_id(IrInstructionEnumTagType *) {546static constexpr IrInstructionId ir_instruction_id(IrInstructionTagType *) {
547 return IrInstructionIdEnumTagType;547 return IrInstructionIdTagType;
548}548}
549549
550static constexpr IrInstructionId ir_instruction_id(IrInstructionFieldParentPtr *) {550static constexpr IrInstructionId ir_instruction_id(IrInstructionFieldParentPtr *) {
...@@ -2205,10 +2205,10 @@ static IrInstruction *ir_build_panic(IrBuilder *irb, Scope *scope, AstNode *sour...@@ -2205,10 +2205,10 @@ static IrInstruction *ir_build_panic(IrBuilder *irb, Scope *scope, AstNode *sour
2205 return &instruction->base;2205 return &instruction->base;
2206}2206}
22072207
2208static IrInstruction *ir_build_enum_tag_name(IrBuilder *irb, Scope *scope, AstNode *source_node,2208static IrInstruction *ir_build_tag_name(IrBuilder *irb, Scope *scope, AstNode *source_node,
2209 IrInstruction *target)2209 IrInstruction *target)
2210{2210{
2211 IrInstructionEnumTagName *instruction = ir_build_instruction<IrInstructionEnumTagName>(irb, scope, source_node);2211 IrInstructionTagName *instruction = ir_build_instruction<IrInstructionTagName>(irb, scope, source_node);
2212 instruction->target = target;2212 instruction->target = target;
22132213
2214 ir_ref_instruction(target, irb->current_basic_block);2214 ir_ref_instruction(target, irb->current_basic_block);
...@@ -2216,10 +2216,10 @@ static IrInstruction *ir_build_enum_tag_name(IrBuilder *irb, Scope *scope, AstNo...@@ -2216,10 +2216,10 @@ static IrInstruction *ir_build_enum_tag_name(IrBuilder *irb, Scope *scope, AstNo
2216 return &instruction->base;2216 return &instruction->base;
2217}2217}
22182218
2219static IrInstruction *ir_build_enum_tag_type(IrBuilder *irb, Scope *scope, AstNode *source_node,2219static IrInstruction *ir_build_tag_type(IrBuilder *irb, Scope *scope, AstNode *source_node,
2220 IrInstruction *target)2220 IrInstruction *target)
2221{2221{
2222 IrInstructionEnumTagType *instruction = ir_build_instruction<IrInstructionEnumTagType>(irb, scope, source_node);2222 IrInstructionTagType *instruction = ir_build_instruction<IrInstructionTagType>(irb, scope, source_node);
2223 instruction->target = target;2223 instruction->target = target;
22242224
2225 ir_ref_instruction(target, irb->current_basic_block);2225 ir_ref_instruction(target, irb->current_basic_block);
...@@ -3002,14 +3002,14 @@ static IrInstruction *ir_instruction_panic_get_dep(IrInstructionPanic *instructi...@@ -3002,14 +3002,14 @@ static IrInstruction *ir_instruction_panic_get_dep(IrInstructionPanic *instructi
3002 }3002 }
3003}3003}
30043004
3005static IrInstruction *ir_instruction_enumtagname_get_dep(IrInstructionEnumTagName *instruction, size_t index) {3005static IrInstruction *ir_instruction_enumtagname_get_dep(IrInstructionTagName *instruction, size_t index) {
3006 switch (index) {3006 switch (index) {
3007 case 0: return instruction->target;3007 case 0: return instruction->target;
3008 default: return nullptr;3008 default: return nullptr;
3009 }3009 }
3010}3010}
30113011
3012static IrInstruction *ir_instruction_enumtagtype_get_dep(IrInstructionEnumTagType *instruction, size_t index) {3012static IrInstruction *ir_instruction_enumtagtype_get_dep(IrInstructionTagType *instruction, size_t index) {
3013 switch (index) {3013 switch (index) {
3014 case 0: return instruction->target;3014 case 0: return instruction->target;
3015 default: return nullptr;3015 default: return nullptr;
...@@ -3270,10 +3270,10 @@ static IrInstruction *ir_instruction_get_dep(IrInstruction *instruction, size_t...@@ -3270,10 +3270,10 @@ static IrInstruction *ir_instruction_get_dep(IrInstruction *instruction, size_t
3270 return ir_instruction_declref_get_dep((IrInstructionDeclRef *) instruction, index);3270 return ir_instruction_declref_get_dep((IrInstructionDeclRef *) instruction, index);
3271 case IrInstructionIdPanic:3271 case IrInstructionIdPanic:
3272 return ir_instruction_panic_get_dep((IrInstructionPanic *) instruction, index);3272 return ir_instruction_panic_get_dep((IrInstructionPanic *) instruction, index);
3273 case IrInstructionIdEnumTagName:3273 case IrInstructionIdTagName:
3274 return ir_instruction_enumtagname_get_dep((IrInstructionEnumTagName *) instruction, index);3274 return ir_instruction_enumtagname_get_dep((IrInstructionTagName *) instruction, index);
3275 case IrInstructionIdEnumTagType:3275 case IrInstructionIdTagType:
3276 return ir_instruction_enumtagtype_get_dep((IrInstructionEnumTagType *) instruction, index);3276 return ir_instruction_enumtagtype_get_dep((IrInstructionTagType *) instruction, index);
3277 case IrInstructionIdFieldParentPtr:3277 case IrInstructionIdFieldParentPtr:
3278 return ir_instruction_fieldparentptr_get_dep((IrInstructionFieldParentPtr *) instruction, index);3278 return ir_instruction_fieldparentptr_get_dep((IrInstructionFieldParentPtr *) instruction, index);
3279 case IrInstructionIdOffsetOf:3279 case IrInstructionIdOffsetOf:
...@@ -4627,16 +4627,16 @@ static IrInstruction *ir_gen_builtin_fn_call(IrBuilder *irb, Scope *scope, AstNo...@@ -4627,16 +4627,16 @@ static IrInstruction *ir_gen_builtin_fn_call(IrBuilder *irb, Scope *scope, AstNo
4627 return arg0_value;4627 return arg0_value;
46284628
4629 IrInstruction *actual_tag = ir_build_union_tag(irb, scope, node, arg0_value);4629 IrInstruction *actual_tag = ir_build_union_tag(irb, scope, node, arg0_value);
4630 return ir_build_enum_tag_name(irb, scope, node, actual_tag);4630 return ir_build_tag_name(irb, scope, node, actual_tag);
4631 }4631 }
4632 case BuiltinFnIdEnumTagType:4632 case BuiltinFnIdTagType:
4633 {4633 {
4634 AstNode *arg0_node = node->data.fn_call_expr.params.at(0);4634 AstNode *arg0_node = node->data.fn_call_expr.params.at(0);
4635 IrInstruction *arg0_value = ir_gen_node(irb, arg0_node, scope);4635 IrInstruction *arg0_value = ir_gen_node(irb, arg0_node, scope);
4636 if (arg0_value == irb->codegen->invalid_instruction)4636 if (arg0_value == irb->codegen->invalid_instruction)
4637 return arg0_value;4637 return arg0_value;
46384638
4639 return ir_build_enum_tag_type(irb, scope, node, arg0_value);4639 return ir_build_tag_type(irb, scope, node, arg0_value);
4640 }4640 }
4641 case BuiltinFnIdFieldParentPtr:4641 case BuiltinFnIdFieldParentPtr:
4642 {4642 {
...@@ -13638,7 +13638,7 @@ static TypeTableEntry *ir_analyze_instruction_err_name(IrAnalyze *ira, IrInstruc...@@ -13638,7 +13638,7 @@ static TypeTableEntry *ir_analyze_instruction_err_name(IrAnalyze *ira, IrInstruc
13638 return str_type;13638 return str_type;
13639}13639}
1364013640
13641static TypeTableEntry *ir_analyze_instruction_enum_tag_name(IrAnalyze *ira, IrInstructionEnumTagName *instruction) {13641static TypeTableEntry *ir_analyze_instruction_enum_tag_name(IrAnalyze *ira, IrInstructionTagName *instruction) {
13642 IrInstruction *target = instruction->target->other;13642 IrInstruction *target = instruction->target->other;
13643 if (type_is_invalid(target->value.type))13643 if (type_is_invalid(target->value.type))
13644 return ira->codegen->builtin_types.entry_invalid;13644 return ira->codegen->builtin_types.entry_invalid;
...@@ -13658,7 +13658,7 @@ static TypeTableEntry *ir_analyze_instruction_enum_tag_name(IrAnalyze *ira, IrIn...@@ -13658,7 +13658,7 @@ static TypeTableEntry *ir_analyze_instruction_enum_tag_name(IrAnalyze *ira, IrIn
13658 ira->codegen->name_table_enums.append(target->value.type);13658 ira->codegen->name_table_enums.append(target->value.type);
13659 }13659 }
1366013660
13661 IrInstruction *result = ir_build_enum_tag_name(&ira->new_irb, instruction->base.scope,13661 IrInstruction *result = ir_build_tag_name(&ira->new_irb, instruction->base.scope,
13662 instruction->base.source_node, target);13662 instruction->base.source_node, target);
13663 ir_link_new_instruction(result, &instruction->base);13663 ir_link_new_instruction(result, &instruction->base);
13664 TypeTableEntry *u8_ptr_type = get_pointer_to_type(ira->codegen, ira->codegen->builtin_types.entry_u8, true);13664 TypeTableEntry *u8_ptr_type = get_pointer_to_type(ira->codegen, ira->codegen->builtin_types.entry_u8, true);
...@@ -15838,22 +15838,43 @@ static TypeTableEntry *ir_analyze_instruction_arg_type(IrAnalyze *ira, IrInstruc...@@ -15838,22 +15838,43 @@ static TypeTableEntry *ir_analyze_instruction_arg_type(IrAnalyze *ira, IrInstruc
15838 return ira->codegen->builtin_types.entry_type;15838 return ira->codegen->builtin_types.entry_type;
15839}15839}
1584015840
15841static TypeTableEntry *ir_analyze_instruction_enum_tag_type(IrAnalyze *ira, IrInstructionEnumTagType *instruction) {15841static TypeTableEntry *ir_analyze_instruction_tag_type(IrAnalyze *ira, IrInstructionTagType *instruction) {
15842 IrInstruction *target_inst = instruction->target->other;15842 IrInstruction *target_inst = instruction->target->other;
15843 TypeTableEntry *enum_type = ir_resolve_type(ira, target_inst);15843 TypeTableEntry *enum_type = ir_resolve_type(ira, target_inst);
15844 if (type_is_invalid(enum_type))15844 if (type_is_invalid(enum_type))
15845 return ira->codegen->builtin_types.entry_invalid;15845 return ira->codegen->builtin_types.entry_invalid;
15846 if (enum_type->id != TypeTableEntryIdEnum) {15846
15847 ir_add_error(ira, target_inst, buf_sprintf("expected enum, found '%s'", buf_ptr(&enum_type->name)));15847 if (enum_type->id == TypeTableEntryIdEnum) {
15848 ensure_complete_type(ira->codegen, enum_type);
15849 if (type_is_invalid(enum_type))
15850 return ira->codegen->builtin_types.entry_invalid;
15851
15852 ConstExprValue *out_val = ir_build_const_from(ira, &instruction->base);
15853 out_val->data.x_type = enum_type->data.enumeration.tag_int_type;
15854 return ira->codegen->builtin_types.entry_type;
15855 } else if (enum_type->id == TypeTableEntryIdUnion) {
15856 ensure_complete_type(ira->codegen, enum_type);
15857 if (type_is_invalid(enum_type))
15858 return ira->codegen->builtin_types.entry_invalid;
15859
15860 AstNode *decl_node = enum_type->data.unionation.decl_node;
15861 if (decl_node->data.container_decl.auto_enum || decl_node->data.container_decl.init_arg_expr != nullptr) {
15862 assert(enum_type->data.unionation.tag_type != nullptr);
15863
15864 ConstExprValue *out_val = ir_build_const_from(ira, &instruction->base);
15865 out_val->data.x_type = enum_type->data.unionation.tag_type;
15866 return ira->codegen->builtin_types.entry_type;
15867 } else {
15868 ErrorMsg *msg = ir_add_error(ira, target_inst, buf_sprintf("union '%s' has no tag",
15869 buf_ptr(&enum_type->name)));
15870 add_error_note(ira->codegen, msg, decl_node, buf_sprintf("consider 'union(enum)' here"));
15871 return ira->codegen->builtin_types.entry_invalid;
15872 }
15873 } else {
15874 ir_add_error(ira, target_inst, buf_sprintf("expected enum or union, found '%s'",
15875 buf_ptr(&enum_type->name)));
15848 return ira->codegen->builtin_types.entry_invalid;15876 return ira->codegen->builtin_types.entry_invalid;
15849 }15877 }
15850 ensure_complete_type(ira->codegen, enum_type);
15851 if (type_is_invalid(enum_type))
15852 return ira->codegen->builtin_types.entry_invalid;
15853
15854 ConstExprValue *out_val = ir_build_const_from(ira, &instruction->base);
15855 out_val->data.x_type = enum_type->data.enumeration.tag_int_type;
15856 return ira->codegen->builtin_types.entry_type;
15857}15878}
1585815879
15859static TypeTableEntry *ir_analyze_instruction_nocast(IrAnalyze *ira, IrInstruction *instruction) {15880static TypeTableEntry *ir_analyze_instruction_nocast(IrAnalyze *ira, IrInstruction *instruction) {
...@@ -16032,8 +16053,8 @@ static TypeTableEntry *ir_analyze_instruction_nocast(IrAnalyze *ira, IrInstructi...@@ -16032,8 +16053,8 @@ static TypeTableEntry *ir_analyze_instruction_nocast(IrAnalyze *ira, IrInstructi
16032 return ir_analyze_instruction_int_to_ptr(ira, (IrInstructionIntToPtr *)instruction);16053 return ir_analyze_instruction_int_to_ptr(ira, (IrInstructionIntToPtr *)instruction);
16033 case IrInstructionIdPtrToInt:16054 case IrInstructionIdPtrToInt:
16034 return ir_analyze_instruction_ptr_to_int(ira, (IrInstructionPtrToInt *)instruction);16055 return ir_analyze_instruction_ptr_to_int(ira, (IrInstructionPtrToInt *)instruction);
16035 case IrInstructionIdEnumTagName:16056 case IrInstructionIdTagName:
16036 return ir_analyze_instruction_enum_tag_name(ira, (IrInstructionEnumTagName *)instruction);16057 return ir_analyze_instruction_enum_tag_name(ira, (IrInstructionTagName *)instruction);
16037 case IrInstructionIdFieldParentPtr:16058 case IrInstructionIdFieldParentPtr:
16038 return ir_analyze_instruction_field_parent_ptr(ira, (IrInstructionFieldParentPtr *)instruction);16059 return ir_analyze_instruction_field_parent_ptr(ira, (IrInstructionFieldParentPtr *)instruction);
16039 case IrInstructionIdOffsetOf:16060 case IrInstructionIdOffsetOf:
...@@ -16052,8 +16073,8 @@ static TypeTableEntry *ir_analyze_instruction_nocast(IrAnalyze *ira, IrInstructi...@@ -16052,8 +16073,8 @@ static TypeTableEntry *ir_analyze_instruction_nocast(IrAnalyze *ira, IrInstructi
16052 return ir_analyze_instruction_set_align_stack(ira, (IrInstructionSetAlignStack *)instruction);16073 return ir_analyze_instruction_set_align_stack(ira, (IrInstructionSetAlignStack *)instruction);
16053 case IrInstructionIdArgType:16074 case IrInstructionIdArgType:
16054 return ir_analyze_instruction_arg_type(ira, (IrInstructionArgType *)instruction);16075 return ir_analyze_instruction_arg_type(ira, (IrInstructionArgType *)instruction);
16055 case IrInstructionIdEnumTagType:16076 case IrInstructionIdTagType:
16056 return ir_analyze_instruction_enum_tag_type(ira, (IrInstructionEnumTagType *)instruction);16077 return ir_analyze_instruction_tag_type(ira, (IrInstructionTagType *)instruction);
16057 }16078 }
16058 zig_unreachable();16079 zig_unreachable();
16059}16080}
...@@ -16230,14 +16251,14 @@ bool ir_has_side_effects(IrInstruction *instruction) {...@@ -16230,14 +16251,14 @@ bool ir_has_side_effects(IrInstruction *instruction) {
16230 case IrInstructionIdDeclRef:16251 case IrInstructionIdDeclRef:
16231 case IrInstructionIdErrName:16252 case IrInstructionIdErrName:
16232 case IrInstructionIdTypeName:16253 case IrInstructionIdTypeName:
16233 case IrInstructionIdEnumTagName:16254 case IrInstructionIdTagName:
16234 case IrInstructionIdFieldParentPtr:16255 case IrInstructionIdFieldParentPtr:
16235 case IrInstructionIdOffsetOf:16256 case IrInstructionIdOffsetOf:
16236 case IrInstructionIdTypeId:16257 case IrInstructionIdTypeId:
16237 case IrInstructionIdAlignCast:16258 case IrInstructionIdAlignCast:
16238 case IrInstructionIdOpaqueType:16259 case IrInstructionIdOpaqueType:
16239 case IrInstructionIdArgType:16260 case IrInstructionIdArgType:
16240 case IrInstructionIdEnumTagType:16261 case IrInstructionIdTagType:
16241 return false;16262 return false;
16242 case IrInstructionIdAsm:16263 case IrInstructionIdAsm:
16243 {16264 {
src/ir_print.cpp+8-8
...@@ -872,8 +872,8 @@ static void ir_print_type_name(IrPrint *irp, IrInstructionTypeName *instruction)...@@ -872,8 +872,8 @@ static void ir_print_type_name(IrPrint *irp, IrInstructionTypeName *instruction)
872 ir_print_other_instruction(irp, instruction->type_value);872 ir_print_other_instruction(irp, instruction->type_value);
873}873}
874874
875static void ir_print_enum_tag_name(IrPrint *irp, IrInstructionEnumTagName *instruction) {875static void ir_print_tag_name(IrPrint *irp, IrInstructionTagName *instruction) {
876 fprintf(irp->f, "enumtagname ");876 fprintf(irp->f, "tagname ");
877 ir_print_other_instruction(irp, instruction->target);877 ir_print_other_instruction(irp, instruction->target);
878}878}
879879
...@@ -981,8 +981,8 @@ static void ir_print_arg_type(IrPrint *irp, IrInstructionArgType *instruction) {...@@ -981,8 +981,8 @@ static void ir_print_arg_type(IrPrint *irp, IrInstructionArgType *instruction) {
981 fprintf(irp->f, ")");981 fprintf(irp->f, ")");
982}982}
983983
984static void ir_print_enum_tag_type(IrPrint *irp, IrInstructionEnumTagType *instruction) {984static void ir_print_enum_tag_type(IrPrint *irp, IrInstructionTagType *instruction) {
985 fprintf(irp->f, "@EnumTagType(");985 fprintf(irp->f, "@TagType(");
986 ir_print_other_instruction(irp, instruction->target);986 ir_print_other_instruction(irp, instruction->target);
987 fprintf(irp->f, ")");987 fprintf(irp->f, ")");
988}988}
...@@ -1254,8 +1254,8 @@ static void ir_print_instruction(IrPrint *irp, IrInstruction *instruction) {...@@ -1254,8 +1254,8 @@ static void ir_print_instruction(IrPrint *irp, IrInstruction *instruction) {
1254 case IrInstructionIdTypeName:1254 case IrInstructionIdTypeName:
1255 ir_print_type_name(irp, (IrInstructionTypeName *)instruction);1255 ir_print_type_name(irp, (IrInstructionTypeName *)instruction);
1256 break;1256 break;
1257 case IrInstructionIdEnumTagName:1257 case IrInstructionIdTagName:
1258 ir_print_enum_tag_name(irp, (IrInstructionEnumTagName *)instruction);1258 ir_print_tag_name(irp, (IrInstructionTagName *)instruction);
1259 break;1259 break;
1260 case IrInstructionIdCanImplicitCast:1260 case IrInstructionIdCanImplicitCast:
1261 ir_print_can_implicit_cast(irp, (IrInstructionCanImplicitCast *)instruction);1261 ir_print_can_implicit_cast(irp, (IrInstructionCanImplicitCast *)instruction);
...@@ -1299,8 +1299,8 @@ static void ir_print_instruction(IrPrint *irp, IrInstruction *instruction) {...@@ -1299,8 +1299,8 @@ static void ir_print_instruction(IrPrint *irp, IrInstruction *instruction) {
1299 case IrInstructionIdArgType:1299 case IrInstructionIdArgType:
1300 ir_print_arg_type(irp, (IrInstructionArgType *)instruction);1300 ir_print_arg_type(irp, (IrInstructionArgType *)instruction);
1301 break;1301 break;
1302 case IrInstructionIdEnumTagType:1302 case IrInstructionIdTagType:
1303 ir_print_enum_tag_type(irp, (IrInstructionEnumTagType *)instruction);1303 ir_print_enum_tag_type(irp, (IrInstructionTagType *)instruction);
1304 break;1304 break;
1305 }1305 }
1306 fprintf(irp->f, "\n");1306 fprintf(irp->f, "\n");
test/cases/enum.zig+2-2
...@@ -204,12 +204,12 @@ test "set enum tag type" {...@@ -204,12 +204,12 @@ test "set enum tag type" {
204 {204 {
205 var x = Small.One;205 var x = Small.One;
206 x = Small.Two;206 x = Small.Two;
207 comptime assert(@EnumTagType(Small) == u2);207 comptime assert(@TagType(Small) == u2);
208 }208 }
209 {209 {
210 var x = Small2.One;210 var x = Small2.One;
211 x = Small2.Two;211 x = Small2.Two;
212 comptime assert(@EnumTagType(Small2) == u2);212 comptime assert(@TagType(Small2) == u2);
213 }213 }
214}214}
215215
test/cases/union.zig+33
...@@ -104,3 +104,36 @@ fn bar(value: &const Payload) -> i32 {...@@ -104,3 +104,36 @@ fn bar(value: &const Payload) -> i32 {
104 Payload.C => |x| if (x) i32(30) else 31,104 Payload.C => |x| if (x) i32(30) else 31,
105 };105 };
106}106}
107
108const MultipleChoice2 = union(enum(u32)) {
109 Unspecified1: i32,
110 A: f32 = 20,
111 Unspecified2: void,
112 B: bool = 40,
113 Unspecified3: i32,
114 C: i8 = 60,
115 Unspecified4: void,
116 D: void = 1000,
117 Unspecified5: i32,
118};
119
120test "union(enum(u32)) with specified and unspecified tag values" {
121 comptime assert(@TagType(@TagType(MultipleChoice2)) == u32);
122 testEnumWithSpecifiedAndUnspecifiedTagValues(MultipleChoice2 {.C = 123});
123 comptime testEnumWithSpecifiedAndUnspecifiedTagValues(MultipleChoice2 { .C = 123} );
124}
125
126fn testEnumWithSpecifiedAndUnspecifiedTagValues(x: &const MultipleChoice2) {
127 assert(u32(@TagType(MultipleChoice2)(*x)) == 60);
128 assert(1123 == switch (*x) {
129 MultipleChoice2.A => 1,
130 MultipleChoice2.B => 2,
131 MultipleChoice2.C => |v| i32(1000) + v,
132 MultipleChoice2.D => 4,
133 MultipleChoice2.Unspecified1 => 5,
134 MultipleChoice2.Unspecified2 => 6,
135 MultipleChoice2.Unspecified3 => 7,
136 MultipleChoice2.Unspecified4 => 8,
137 MultipleChoice2.Unspecified5 => 9,
138 });
139}