authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-07-03 13:55:50-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-07-03 13:55:50-04:00
loga1359ac3abbb83f30719f596180f1e923da3a8f2
tree194da04d4f7cf3be9795e8d2edab96ac1c1a31af
parent9daf0140e5a78802fd294bce8a9019f59bd89b61
parent4bae87764fc455f4df8b9d96be856921b0dd97db
signaturelock-open Commit is signed but in an unrecognized format.

Merge branch 'rbscott-comptime-union-init'

6 files changed, 208 insertions(+), 28 deletions(-)

doc/langref.html.in+17
...@@ -5065,6 +5065,12 @@ test "@intToPtr for pointer to zero bit type" {...@@ -5065,6 +5065,12 @@ test "@intToPtr for pointer to zero bit type" {
5065 {#header_close#}5065 {#header_close#}
5066 {#header_close#}5066 {#header_close#}
50675067
5068 {#header_open|Result Location Semantics#}
5069 <p>
5070 <a href="https://github.com/ziglang/zig/issues/2809">TODO add documentation for this</a>
5071 </p>
5072 {#header_close#}
5073
5068 {#header_open|comptime#}5074 {#header_open|comptime#}
5069 <p>5075 <p>
5070 Zig places importance on the concept of whether an expression is known at compile-time.5076 Zig places importance on the concept of whether an expression is known at compile-time.
...@@ -7809,6 +7815,17 @@ pub const TypeInfo = union(TypeId) {...@@ -7809,6 +7815,17 @@ pub const TypeInfo = union(TypeId) {
78097815
7810 {#header_close#}7816 {#header_close#}
78117817
7818 {#header_open|@unionInit#}
7819 <pre>{#syntax#}@unionInit(comptime Union: type, comptime active_field_name: []const u8, init_expr) Union{#endsyntax#}</pre>
7820 <p>
7821 This is the same thing as {#link|union#} initialization syntax, except that the field name is a
7822 {#link|comptime#}-known value rather than an identifier token.
7823 </p>
7824 <p>
7825 {#syntax#}@unionInit{#endsyntax#} forwards its {#link|result location|Result Location Semantics#} to {#syntax#}init_expr{#endsyntax#}.
7826 </p>
7827 {#header_close#}
7828
7812 {#header_open|@Vector#}7829 {#header_open|@Vector#}
7813 <pre>{#syntax#}@Vector(comptime len: u32, comptime ElemType: type) type{#endsyntax#}</pre>7830 <pre>{#syntax#}@Vector(comptime len: u32, comptime ElemType: type) type{#endsyntax#}</pre>
7814 <p>7831 <p>
src/all_types.hpp+11
...@@ -1509,6 +1509,7 @@ enum BuiltinFnId {...@@ -1509,6 +1509,7 @@ enum BuiltinFnId {
1509 BuiltinFnIdAtomicRmw,1509 BuiltinFnIdAtomicRmw,
1510 BuiltinFnIdAtomicLoad,1510 BuiltinFnIdAtomicLoad,
1511 BuiltinFnIdHasDecl,1511 BuiltinFnIdHasDecl,
1512 BuiltinFnIdUnionInit,
1512};1513};
15131514
1514struct BuiltinFnEntry {1515struct BuiltinFnEntry {
...@@ -2359,6 +2360,7 @@ enum IrInstructionId {...@@ -2359,6 +2360,7 @@ enum IrInstructionId {
2359 IrInstructionIdAllocaGen,2360 IrInstructionIdAllocaGen,
2360 IrInstructionIdEndExpr,2361 IrInstructionIdEndExpr,
2361 IrInstructionIdPtrOfArrayToSlice,2362 IrInstructionIdPtrOfArrayToSlice,
2363 IrInstructionIdUnionInitNamedField,
2362};2364};
23632365
2364struct IrInstruction {2366struct IrInstruction {
...@@ -3603,6 +3605,15 @@ struct IrInstructionAssertNonNull {...@@ -3603,6 +3605,15 @@ struct IrInstructionAssertNonNull {
3603 IrInstruction *target;3605 IrInstruction *target;
3604};3606};
36053607
3608struct IrInstructionUnionInitNamedField {
3609 IrInstruction base;
3610
3611 IrInstruction *union_type;
3612 IrInstruction *field_name;
3613 IrInstruction *field_result_loc;
3614 IrInstruction *result_loc;
3615};
3616
3606struct IrInstructionHasDecl {3617struct IrInstructionHasDecl {
3607 IrInstruction base;3618 IrInstruction base;
36083619
src/codegen.cpp+2
...@@ -5635,6 +5635,7 @@ static LLVMValueRef ir_render_instruction(CodeGen *g, IrExecutable *executable,...@@ -5635,6 +5635,7 @@ static LLVMValueRef ir_render_instruction(CodeGen *g, IrExecutable *executable,
5635 case IrInstructionIdRef:5635 case IrInstructionIdRef:
5636 case IrInstructionIdBitCastSrc:5636 case IrInstructionIdBitCastSrc:
5637 case IrInstructionIdTestErrSrc:5637 case IrInstructionIdTestErrSrc:
5638 case IrInstructionIdUnionInitNamedField:
5638 zig_unreachable();5639 zig_unreachable();
56395640
5640 case IrInstructionIdDeclVarGen:5641 case IrInstructionIdDeclVarGen:
...@@ -7419,6 +7420,7 @@ static void define_builtin_fns(CodeGen *g) {...@@ -7419,6 +7420,7 @@ static void define_builtin_fns(CodeGen *g) {
7419 create_builtin_fn(g, BuiltinFnIdFromBytes, "bytesToSlice", 2);7420 create_builtin_fn(g, BuiltinFnIdFromBytes, "bytesToSlice", 2);
7420 create_builtin_fn(g, BuiltinFnIdThis, "This", 0);7421 create_builtin_fn(g, BuiltinFnIdThis, "This", 0);
7421 create_builtin_fn(g, BuiltinFnIdHasDecl, "hasDecl", 2);7422 create_builtin_fn(g, BuiltinFnIdHasDecl, "hasDecl", 2);
7423 create_builtin_fn(g, BuiltinFnIdUnionInit, "unionInit", 3);
7422}7424}
74237425
7424static const char *bool_to_str(bool b) {7426static const char *bool_to_str(bool b) {
src/ir.cpp+127-27
...@@ -198,6 +198,9 @@ static IrInstruction *ir_analyze_unwrap_err_code(IrAnalyze *ira, IrInstruction *...@@ -198,6 +198,9 @@ static IrInstruction *ir_analyze_unwrap_err_code(IrAnalyze *ira, IrInstruction *
198 IrInstruction *base_ptr, bool initializing);198 IrInstruction *base_ptr, bool initializing);
199static IrInstruction *ir_analyze_store_ptr(IrAnalyze *ira, IrInstruction *source_instr,199static IrInstruction *ir_analyze_store_ptr(IrAnalyze *ira, IrInstruction *source_instr,
200 IrInstruction *ptr, IrInstruction *uncasted_value);200 IrInstruction *ptr, IrInstruction *uncasted_value);
201static IrInstruction *ir_gen_union_init_expr(IrBuilder *irb, Scope *scope, AstNode *source_node,
202 IrInstruction *union_type, IrInstruction *field_name, AstNode *expr_node,
203 LVal lval, ResultLoc *parent_result_loc);
201204
202static ConstExprValue *const_ptr_pointee_unchecked(CodeGen *g, ConstExprValue *const_val) {205static ConstExprValue *const_ptr_pointee_unchecked(CodeGen *g, ConstExprValue *const_val) {
203 assert(get_src_ptr_type(const_val->type) != nullptr);206 assert(get_src_ptr_type(const_val->type) != nullptr);
...@@ -1089,6 +1092,10 @@ static constexpr IrInstructionId ir_instruction_id(IrInstructionEndExpr *) {...@@ -1089,6 +1092,10 @@ static constexpr IrInstructionId ir_instruction_id(IrInstructionEndExpr *) {
1089 return IrInstructionIdEndExpr;1092 return IrInstructionIdEndExpr;
1090}1093}
10911094
1095static constexpr IrInstructionId ir_instruction_id(IrInstructionUnionInitNamedField *) {
1096 return IrInstructionIdUnionInitNamedField;
1097}
1098
1092template<typename T>1099template<typename T>
1093static T *ir_create_instruction(IrBuilder *irb, Scope *scope, AstNode *source_node) {1100static T *ir_create_instruction(IrBuilder *irb, Scope *scope, AstNode *source_node) {
1094 T *special_instruction = allocate<T>(1);1101 T *special_instruction = allocate<T>(1);
...@@ -1352,12 +1359,13 @@ static IrInstruction *ir_build_elem_ptr(IrBuilder *irb, Scope *scope, AstNode *s...@@ -1352,12 +1359,13 @@ static IrInstruction *ir_build_elem_ptr(IrBuilder *irb, Scope *scope, AstNode *s
1352}1359}
13531360
1354static IrInstruction *ir_build_field_ptr_instruction(IrBuilder *irb, Scope *scope, AstNode *source_node,1361static IrInstruction *ir_build_field_ptr_instruction(IrBuilder *irb, Scope *scope, AstNode *source_node,
1355 IrInstruction *container_ptr, IrInstruction *field_name_expr)1362 IrInstruction *container_ptr, IrInstruction *field_name_expr, bool initializing)
1356{1363{
1357 IrInstructionFieldPtr *instruction = ir_build_instruction<IrInstructionFieldPtr>(irb, scope, source_node);1364 IrInstructionFieldPtr *instruction = ir_build_instruction<IrInstructionFieldPtr>(irb, scope, source_node);
1358 instruction->container_ptr = container_ptr;1365 instruction->container_ptr = container_ptr;
1359 instruction->field_name_buffer = nullptr;1366 instruction->field_name_buffer = nullptr;
1360 instruction->field_name_expr = field_name_expr;1367 instruction->field_name_expr = field_name_expr;
1368 instruction->initializing = initializing;
13611369
1362 ir_ref_instruction(container_ptr, irb->current_basic_block);1370 ir_ref_instruction(container_ptr, irb->current_basic_block);
1363 ir_ref_instruction(field_name_expr, irb->current_basic_block);1371 ir_ref_instruction(field_name_expr, irb->current_basic_block);
...@@ -3324,6 +3332,24 @@ static IrInstruction *ir_build_check_runtime_scope(IrBuilder *irb, Scope *scope,...@@ -3324,6 +3332,24 @@ static IrInstruction *ir_build_check_runtime_scope(IrBuilder *irb, Scope *scope,
3324 return &instruction->base;3332 return &instruction->base;
3325}3333}
33263334
3335static IrInstruction *ir_build_union_init_named_field(IrBuilder *irb, Scope *scope, AstNode *source_node,
3336 IrInstruction *union_type, IrInstruction *field_name, IrInstruction *field_result_loc, IrInstruction *result_loc)
3337{
3338 IrInstructionUnionInitNamedField *instruction = ir_build_instruction<IrInstructionUnionInitNamedField>(irb, scope, source_node);
3339 instruction->union_type = union_type;
3340 instruction->field_name = field_name;
3341 instruction->field_result_loc = field_result_loc;
3342 instruction->result_loc = result_loc;
3343
3344 ir_ref_instruction(union_type, irb->current_basic_block);
3345 ir_ref_instruction(field_name, irb->current_basic_block);
3346 ir_ref_instruction(field_result_loc, irb->current_basic_block);
3347 if (result_loc != nullptr) ir_ref_instruction(result_loc, irb->current_basic_block);
3348
3349 return &instruction->base;
3350}
3351
3352
3327static IrInstruction *ir_build_vector_to_array(IrAnalyze *ira, IrInstruction *source_instruction,3353static IrInstruction *ir_build_vector_to_array(IrAnalyze *ira, IrInstruction *source_instruction,
3328 ZigType *result_type, IrInstruction *vector, IrInstruction *result_loc)3354 ZigType *result_type, IrInstruction *vector, IrInstruction *result_loc)
3329{3355{
...@@ -5110,7 +5136,8 @@ static IrInstruction *ir_gen_builtin_fn_call(IrBuilder *irb, Scope *scope, AstNo...@@ -5110,7 +5136,8 @@ static IrInstruction *ir_gen_builtin_fn_call(IrBuilder *irb, Scope *scope, AstNo
5110 if (arg1_value == irb->codegen->invalid_instruction)5136 if (arg1_value == irb->codegen->invalid_instruction)
5111 return arg1_value;5137 return arg1_value;
51125138
5113 IrInstruction *ptr_instruction = ir_build_field_ptr_instruction(irb, scope, node, arg0_value, arg1_value);5139 IrInstruction *ptr_instruction = ir_build_field_ptr_instruction(irb, scope, node,
5140 arg0_value, arg1_value, false);
51145141
5115 if (lval == LValPtr)5142 if (lval == LValPtr)
5116 return ptr_instruction;5143 return ptr_instruction;
...@@ -5651,6 +5678,23 @@ static IrInstruction *ir_gen_builtin_fn_call(IrBuilder *irb, Scope *scope, AstNo...@@ -5651,6 +5678,23 @@ static IrInstruction *ir_gen_builtin_fn_call(IrBuilder *irb, Scope *scope, AstNo
5651 IrInstruction *has_decl = ir_build_has_decl(irb, scope, node, arg0_value, arg1_value);5678 IrInstruction *has_decl = ir_build_has_decl(irb, scope, node, arg0_value, arg1_value);
5652 return ir_lval_wrap(irb, scope, has_decl, lval, result_loc);5679 return ir_lval_wrap(irb, scope, has_decl, lval, result_loc);
5653 }5680 }
5681 case BuiltinFnIdUnionInit:
5682 {
5683 AstNode *union_type_node = node->data.fn_call_expr.params.at(0);
5684 IrInstruction *union_type_inst = ir_gen_node(irb, union_type_node, scope);
5685 if (union_type_inst == irb->codegen->invalid_instruction)
5686 return union_type_inst;
5687
5688 AstNode *name_node = node->data.fn_call_expr.params.at(1);
5689 IrInstruction *name_inst = ir_gen_node(irb, name_node, scope);
5690 if (name_inst == irb->codegen->invalid_instruction)
5691 return name_inst;
5692
5693 AstNode *init_node = node->data.fn_call_expr.params.at(2);
5694
5695 return ir_gen_union_init_expr(irb, scope, node, union_type_inst, name_inst, init_node,
5696 lval, result_loc);
5697 }
5654 }5698 }
5655 zig_unreachable();5699 zig_unreachable();
5656}5700}
...@@ -5929,6 +5973,31 @@ static IrInstruction *ir_gen_prefix_op_expr(IrBuilder *irb, Scope *scope, AstNod...@@ -5929,6 +5973,31 @@ static IrInstruction *ir_gen_prefix_op_expr(IrBuilder *irb, Scope *scope, AstNod
5929 zig_unreachable();5973 zig_unreachable();
5930}5974}
59315975
5976static IrInstruction *ir_gen_union_init_expr(IrBuilder *irb, Scope *scope, AstNode *source_node,
5977 IrInstruction *union_type, IrInstruction *field_name, AstNode *expr_node,
5978 LVal lval, ResultLoc *parent_result_loc)
5979{
5980 IrInstruction *container_ptr = ir_build_resolve_result(irb, scope, source_node, parent_result_loc, union_type);
5981 IrInstruction *field_ptr = ir_build_field_ptr_instruction(irb, scope, source_node, container_ptr,
5982 field_name, true);
5983
5984 ResultLocInstruction *result_loc_inst = allocate<ResultLocInstruction>(1);
5985 result_loc_inst->base.id = ResultLocIdInstruction;
5986 result_loc_inst->base.source_instruction = field_ptr;
5987 ir_ref_instruction(field_ptr, irb->current_basic_block);
5988 ir_build_reset_result(irb, scope, expr_node, &result_loc_inst->base);
5989
5990 IrInstruction *expr_value = ir_gen_node_extra(irb, expr_node, scope, LValNone,
5991 &result_loc_inst->base);
5992 if (expr_value == irb->codegen->invalid_instruction)
5993 return expr_value;
5994
5995 IrInstruction *init_union = ir_build_union_init_named_field(irb, scope, source_node, union_type,
5996 field_name, field_ptr, container_ptr);
5997
5998 return ir_lval_wrap(irb, scope, init_union, lval, parent_result_loc);
5999}
6000
5932static IrInstruction *ir_gen_container_init_expr(IrBuilder *irb, Scope *scope, AstNode *node, LVal lval,6001static IrInstruction *ir_gen_container_init_expr(IrBuilder *irb, Scope *scope, AstNode *node, LVal lval,
5933 ResultLoc *parent_result_loc)6002 ResultLoc *parent_result_loc)
5934{6003{
...@@ -19408,32 +19477,21 @@ static IrInstruction *ir_analyze_instruction_ref(IrAnalyze *ira, IrInstructionRe...@@ -19408,32 +19477,21 @@ static IrInstruction *ir_analyze_instruction_ref(IrAnalyze *ira, IrInstructionRe
19408 return ir_get_ref(ira, &ref_instruction->base, value, ref_instruction->is_const, ref_instruction->is_volatile);19477 return ir_get_ref(ira, &ref_instruction->base, value, ref_instruction->is_const, ref_instruction->is_volatile);
19409}19478}
1941019479
19411static IrInstruction *ir_analyze_container_init_fields_union(IrAnalyze *ira, IrInstruction *instruction,19480static IrInstruction *ir_analyze_union_init(IrAnalyze *ira, IrInstruction *source_instruction,
19412 ZigType *container_type, size_t instr_field_count, IrInstructionContainerInitFieldsField *fields,19481 AstNode *field_source_node, ZigType *union_type, Buf *field_name, IrInstruction *field_result_loc,
19413 IrInstruction *result_loc)19482 IrInstruction *result_loc)
19414{19483{
19415 Error err;19484 Error err;
19416 assert(container_type->id == ZigTypeIdUnion);19485 assert(union_type->id == ZigTypeIdUnion);
19417
19418 if ((err = type_resolve(ira->codegen, container_type, ResolveStatusSizeKnown)))
19419 return ira->codegen->invalid_instruction;
19420
19421 if (instr_field_count != 1) {
19422 ir_add_error(ira, instruction,
19423 buf_sprintf("union initialization expects exactly one field"));
19424 return ira->codegen->invalid_instruction;
19425 }
1942619486
19427 IrInstructionContainerInitFieldsField *field = &fields[0];19487 if ((err = type_resolve(ira->codegen, union_type, ResolveStatusSizeKnown)))
19428 IrInstruction *field_result_loc = field->result_loc->child;
19429 if (type_is_invalid(field_result_loc->value.type))
19430 return ira->codegen->invalid_instruction;19488 return ira->codegen->invalid_instruction;
1943119489
19432 TypeUnionField *type_field = find_union_type_field(container_type, field->name);19490 TypeUnionField *type_field = find_union_type_field(union_type, field_name);
19433 if (type_field == nullptr) {19491 if (type_field == nullptr) {
19434 ir_add_error_node(ira, field->source_node,19492 ir_add_error_node(ira, field_source_node,
19435 buf_sprintf("no member named '%s' in union '%s'",19493 buf_sprintf("no member named '%s' in union '%s'",
19436 buf_ptr(field->name), buf_ptr(&container_type->name)));19494 buf_ptr(field_name), buf_ptr(&union_type->name)));
19437 return ira->codegen->invalid_instruction;19495 return ira->codegen->invalid_instruction;
19438 }19496 }
1943919497
...@@ -19450,12 +19508,12 @@ static IrInstruction *ir_analyze_container_init_fields_union(IrAnalyze *ira, IrI...@@ -19450,12 +19508,12 @@ static IrInstruction *ir_analyze_container_init_fields_union(IrAnalyze *ira, IrI
19450 }19508 }
19451 }19509 }
1945219510
19453 bool is_comptime = ir_should_inline(ira->new_irb.exec, instruction->scope)19511 bool is_comptime = ir_should_inline(ira->new_irb.exec, source_instruction->scope)
19454 || type_requires_comptime(ira->codegen, container_type) == ReqCompTimeYes;19512 || type_requires_comptime(ira->codegen, union_type) == ReqCompTimeYes;
1945519513
19456 IrInstruction *result = ir_get_deref(ira, instruction, result_loc, nullptr);19514 IrInstruction *result = ir_get_deref(ira, source_instruction, result_loc, nullptr);
19457 if (is_comptime && !instr_is_comptime(result)) {19515 if (is_comptime && !instr_is_comptime(result)) {
19458 ir_add_error(ira, field->result_loc,19516 ir_add_error(ira, field_result_loc,
19459 buf_sprintf("unable to evaluate constant expression"));19517 buf_sprintf("unable to evaluate constant expression"));
19460 return ira->codegen->invalid_instruction;19518 return ira->codegen->invalid_instruction;
19461 }19519 }
...@@ -19468,8 +19526,18 @@ static IrInstruction *ir_analyze_container_init_fields(IrAnalyze *ira, IrInstruc...@@ -19468,8 +19526,18 @@ static IrInstruction *ir_analyze_container_init_fields(IrAnalyze *ira, IrInstruc
19468{19526{
19469 Error err;19527 Error err;
19470 if (container_type->id == ZigTypeIdUnion) {19528 if (container_type->id == ZigTypeIdUnion) {
19471 return ir_analyze_container_init_fields_union(ira, instruction, container_type, instr_field_count,19529 if (instr_field_count != 1) {
19472 fields, result_loc);19530 ir_add_error(ira, instruction,
19531 buf_sprintf("union initialization expects exactly one field"));
19532 return ira->codegen->invalid_instruction;
19533 }
19534 IrInstructionContainerInitFieldsField *field = &fields[0];
19535 IrInstruction *field_result_loc = field->result_loc->child;
19536 if (type_is_invalid(field_result_loc->value.type))
19537 return ira->codegen->invalid_instruction;
19538
19539 return ir_analyze_union_init(ira, instruction, field->source_node, container_type, field->name,
19540 field_result_loc, result_loc);
19473 }19541 }
19474 if (container_type->id != ZigTypeIdStruct || is_slice(container_type)) {19542 if (container_type->id != ZigTypeIdStruct || is_slice(container_type)) {
19475 ir_add_error(ira, instruction,19543 ir_add_error(ira, instruction,
...@@ -25326,6 +25394,35 @@ static IrInstruction *ir_analyze_instruction_bit_cast_src(IrAnalyze *ira, IrInst...@@ -25326,6 +25394,35 @@ static IrInstruction *ir_analyze_instruction_bit_cast_src(IrAnalyze *ira, IrInst
25326 return instruction->result_loc_bit_cast->parent->gen_instruction;25394 return instruction->result_loc_bit_cast->parent->gen_instruction;
25327}25395}
2532825396
25397static IrInstruction *ir_analyze_instruction_union_init_named_field(IrAnalyze *ira,
25398 IrInstructionUnionInitNamedField *instruction)
25399{
25400 ZigType *union_type = ir_resolve_type(ira, instruction->union_type->child);
25401 if (type_is_invalid(union_type))
25402 return ira->codegen->invalid_instruction;
25403
25404 if (union_type->id != ZigTypeIdUnion) {
25405 ir_add_error(ira, instruction->union_type,
25406 buf_sprintf("non-union type '%s' passed to @unionInit", buf_ptr(&union_type->name)));
25407 return ira->codegen->invalid_instruction;
25408 }
25409
25410 Buf *field_name = ir_resolve_str(ira, instruction->field_name->child);
25411 if (field_name == nullptr)
25412 return ira->codegen->invalid_instruction;
25413
25414 IrInstruction *field_result_loc = instruction->field_result_loc->child;
25415 if (type_is_invalid(field_result_loc->value.type))
25416 return ira->codegen->invalid_instruction;
25417
25418 IrInstruction *result_loc = instruction->result_loc->child;
25419 if (type_is_invalid(result_loc->value.type))
25420 return ira->codegen->invalid_instruction;
25421
25422 return ir_analyze_union_init(ira, &instruction->base, instruction->base.source_node,
25423 union_type, field_name, field_result_loc, result_loc);
25424}
25425
25329static IrInstruction *ir_analyze_instruction_base(IrAnalyze *ira, IrInstruction *instruction) {25426static IrInstruction *ir_analyze_instruction_base(IrAnalyze *ira, IrInstruction *instruction) {
25330 switch (instruction->id) {25427 switch (instruction->id) {
25331 case IrInstructionIdInvalid:25428 case IrInstructionIdInvalid:
...@@ -25641,6 +25738,8 @@ static IrInstruction *ir_analyze_instruction_base(IrAnalyze *ira, IrInstruction...@@ -25641,6 +25738,8 @@ static IrInstruction *ir_analyze_instruction_base(IrAnalyze *ira, IrInstruction
25641 return ir_analyze_instruction_end_expr(ira, (IrInstructionEndExpr *)instruction);25738 return ir_analyze_instruction_end_expr(ira, (IrInstructionEndExpr *)instruction);
25642 case IrInstructionIdBitCastSrc:25739 case IrInstructionIdBitCastSrc:
25643 return ir_analyze_instruction_bit_cast_src(ira, (IrInstructionBitCastSrc *)instruction);25740 return ir_analyze_instruction_bit_cast_src(ira, (IrInstructionBitCastSrc *)instruction);
25741 case IrInstructionIdUnionInitNamedField:
25742 return ir_analyze_instruction_union_init_named_field(ira, (IrInstructionUnionInitNamedField *)instruction);
25644 }25743 }
25645 zig_unreachable();25744 zig_unreachable();
25646}25745}
...@@ -25794,6 +25893,7 @@ bool ir_has_side_effects(IrInstruction *instruction) {...@@ -25794,6 +25893,7 @@ bool ir_has_side_effects(IrInstruction *instruction) {
25794 case IrInstructionIdCast:25893 case IrInstructionIdCast:
25795 case IrInstructionIdContainerInitList:25894 case IrInstructionIdContainerInitList:
25796 case IrInstructionIdContainerInitFields:25895 case IrInstructionIdContainerInitFields:
25896 case IrInstructionIdUnionInitNamedField:
25797 case IrInstructionIdFieldPtr:25897 case IrInstructionIdFieldPtr:
25798 case IrInstructionIdElemPtr:25898 case IrInstructionIdElemPtr:
25799 case IrInstructionIdVarPtr:25899 case IrInstructionIdVarPtr:
src/ir_print.cpp+15
...@@ -1626,6 +1626,18 @@ static void ir_print_undeclared_ident(IrPrint *irp, IrInstructionUndeclaredIdent...@@ -1626,6 +1626,18 @@ static void ir_print_undeclared_ident(IrPrint *irp, IrInstructionUndeclaredIdent
1626 fprintf(irp->f, "@undeclaredIdent(%s)", buf_ptr(instruction->name));1626 fprintf(irp->f, "@undeclaredIdent(%s)", buf_ptr(instruction->name));
1627}1627}
16281628
1629static void ir_print_union_init_named_field(IrPrint *irp, IrInstructionUnionInitNamedField *instruction) {
1630 fprintf(irp->f, "@unionInit(");
1631 ir_print_other_instruction(irp, instruction->union_type);
1632 fprintf(irp->f, ", ");
1633 ir_print_other_instruction(irp, instruction->field_name);
1634 fprintf(irp->f, ", ");
1635 ir_print_other_instruction(irp, instruction->field_result_loc);
1636 fprintf(irp->f, ", ");
1637 ir_print_other_instruction(irp, instruction->result_loc);
1638 fprintf(irp->f, ")");
1639}
1640
1629static void ir_print_instruction(IrPrint *irp, IrInstruction *instruction) {1641static void ir_print_instruction(IrPrint *irp, IrInstruction *instruction) {
1630 ir_print_prefix(irp, instruction);1642 ir_print_prefix(irp, instruction);
1631 switch (instruction->id) {1643 switch (instruction->id) {
...@@ -2132,6 +2144,9 @@ static void ir_print_instruction(IrPrint *irp, IrInstruction *instruction) {...@@ -2132,6 +2144,9 @@ static void ir_print_instruction(IrPrint *irp, IrInstruction *instruction) {
2132 case IrInstructionIdEndExpr:2144 case IrInstructionIdEndExpr:
2133 ir_print_end_expr(irp, (IrInstructionEndExpr *)instruction);2145 ir_print_end_expr(irp, (IrInstructionEndExpr *)instruction);
2134 break;2146 break;
2147 case IrInstructionIdUnionInitNamedField:
2148 ir_print_union_init_named_field(irp, (IrInstructionUnionInitNamedField *)instruction);
2149 break;
2135 }2150 }
2136 fprintf(irp->f, "\n");2151 fprintf(irp->f, "\n");
2137}2152}
test/stage1/behavior/union.zig+36-1
...@@ -416,9 +416,44 @@ test "return union init with void payload" {...@@ -416,9 +416,44 @@ test "return union init with void payload" {
416 two: u32,416 two: u32,
417 };417 };
418 fn func() Outer {418 fn func() Outer {
419 return Outer{ .state = State{ .one = {} }};419 return Outer{ .state = State{ .one = {} } };
420 }420 }
421 };421 };
422 S.entry();422 S.entry();
423 comptime S.entry();423 comptime S.entry();
424}424}
425
426test "@unionInit can modify a union type" {
427 const UnionInitEnum = union(enum) {
428 Boolean: bool,
429 Byte: u8,
430 };
431
432 var value: UnionInitEnum = undefined;
433
434 value = @unionInit(UnionInitEnum, "Boolean", true);
435 expect(value.Boolean == true);
436 value.Boolean = false;
437 expect(value.Boolean == false);
438
439 value = @unionInit(UnionInitEnum, "Byte", 2);
440 expect(value.Byte == 2);
441 value.Byte = 3;
442 expect(value.Byte == 3);
443}
444
445test "@unionInit can modify a pointer value" {
446 const UnionInitEnum = union(enum) {
447 Boolean: bool,
448 Byte: u8,
449 };
450
451 var value: UnionInitEnum = undefined;
452 var value_ptr = &value;
453
454 value_ptr.* = @unionInit(UnionInitEnum, "Boolean", true);
455 expect(value.Boolean == true);
456
457 value_ptr.* = @unionInit(UnionInitEnum, "Byte", 2);
458 expect(value.Byte == 2);
459}