authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2017-12-05 22:26:17-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2017-12-05 22:26:17-05:00
logf464fe14f4ece387935dbe2bb6b73ecf466c3f83
tree6eeb66f228b9ab0e41d9a7d35bb19f2b7e9ee556
parentbb6b4f8db2bf793f4118ee68a05ff0b4df52c318

switch on enum which only has 1 field is comptime known

closes #593

2 files changed, 21 insertions(+), 0 deletions(-)

src/ir.cpp+10
...@@ -13174,6 +13174,16 @@ static TypeTableEntry *ir_analyze_instruction_switch_target(IrAnalyze *ira,...@@ -13174,6 +13174,16 @@ static TypeTableEntry *ir_analyze_instruction_switch_target(IrAnalyze *ira,
13174 return tag_type;13174 return tag_type;
13175 }13175 }
13176 case TypeTableEntryIdEnum: {13176 case TypeTableEntryIdEnum: {
13177 type_ensure_zero_bits_known(ira->codegen, target_type);
13178 if (type_is_invalid(target_type))
13179 return ira->codegen->builtin_types.entry_invalid;
13180 if (target_type->data.enumeration.src_field_count < 2) {
13181 TypeEnumField *only_field = &target_type->data.enumeration.fields[0];
13182 ConstExprValue *out_val = ir_build_const_from(ira, &switch_target_instruction->base);
13183 bigint_init_bigint(&out_val->data.x_enum_tag, &only_field->value);
13184 return target_type;
13185 }
13186
13177 if (pointee_val) {13187 if (pointee_val) {
13178 ConstExprValue *out_val = ir_build_const_from(ira, &switch_target_instruction->base);13188 ConstExprValue *out_val = ir_build_const_from(ira, &switch_target_instruction->base);
13179 bigint_init_bigint(&out_val->data.x_enum_tag, &pointee_val->data.x_enum_tag);13189 bigint_init_bigint(&out_val->data.x_enum_tag, &pointee_val->data.x_enum_tag);
test/cases/enum.zig+11
...@@ -366,3 +366,14 @@ fn doALoopThing(id: EnumWithOneMember) {...@@ -366,3 +366,14 @@ fn doALoopThing(id: EnumWithOneMember) {
366test "comparison operator on enum with one member is comptime known" {366test "comparison operator on enum with one member is comptime known" {
367 doALoopThing(EnumWithOneMember.Eof);367 doALoopThing(EnumWithOneMember.Eof);
368}368}
369
370const State = enum {
371 Start,
372};
373test "switch on enum with one member is comptime known" {
374 var state = State.Start;
375 switch (state) {
376 State.Start => return,
377 }
378 @compileError("analysis should not reach here");
379}