mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-16 19:23:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix switch with null and T peer types and inferred result location type

Browse Source 
closes #2762
This commit is contained in:
Andrew Kelley 2019-06-27 16:54:19 -04:00
parent d422d5753b
commit 1b23c46138
No known key found for this signature in database
GPG Key ID: 7C5F548F728501A9
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ir.cpp
View File

@ -7156,7 +7156,7 @@ static IrInstruction *ir_gen_switch_expr(IrBuilder *irb, Scope *scope, AstNode *
ir_set_cursor_at_end_and_append_block(irb, else_block); ir_set_cursor_at_end_and_append_block(irb, else_block);
if (!ir_gen_switch_prong_expr(irb, subexpr_scope, node, prong_node, end_block, if (!ir_gen_switch_prong_expr(irb, subexpr_scope, node, prong_node, end_block,
is_comptime, var_is_comptime, target_value_ptr, nullptr, 0, &incoming_blocks, &incoming_values, is_comptime, var_is_comptime, target_value_ptr, nullptr, 0, &incoming_blocks, &incoming_values,
&switch_else_var, lval, &this_peer_result_loc->base)) &switch_else_var, LValNone, &this_peer_result_loc->base))
{ {
return irb->codegen->invalid_instruction; return irb->codegen->invalid_instruction;
} }
@ -7233,7 +7233,7 @@ static IrInstruction *ir_gen_switch_expr(IrBuilder *irb, Scope *scope, AstNode *
ir_set_cursor_at_end_and_append_block(irb, range_block_yes); ir_set_cursor_at_end_and_append_block(irb, range_block_yes);
if (!ir_gen_switch_prong_expr(irb, subexpr_scope, node, prong_node, end_block, if (!ir_gen_switch_prong_expr(irb, subexpr_scope, node, prong_node, end_block,
is_comptime, var_is_comptime, target_value_ptr, nullptr, 0, is_comptime, var_is_comptime, target_value_ptr, nullptr, 0,
&incoming_blocks, &incoming_values, nullptr, lval, &this_peer_result_loc->base)) &incoming_blocks, &incoming_values, nullptr, LValNone, &this_peer_result_loc->base))
{ {
return irb->codegen->invalid_instruction; return irb->codegen->invalid_instruction;
} }
@ -7283,7 +7283,7 @@ static IrInstruction *ir_gen_switch_expr(IrBuilder *irb, Scope *scope, AstNode *
ir_set_cursor_at_end_and_append_block(irb, prong_block); ir_set_cursor_at_end_and_append_block(irb, prong_block);
if (!ir_gen_switch_prong_expr(irb, subexpr_scope, node, prong_node, end_block, if (!ir_gen_switch_prong_expr(irb, subexpr_scope, node, prong_node, end_block,
is_comptime, var_is_comptime, target_value_ptr, items, prong_item_count, is_comptime, var_is_comptime, target_value_ptr, items, prong_item_count,
&incoming_blocks, &incoming_values, nullptr, lval, &this_peer_result_loc->base)) &incoming_blocks, &incoming_values, nullptr, LValNone, &this_peer_result_loc->base))
{ {
return irb->codegen->invalid_instruction; return irb->codegen->invalid_instruction;
} }
@ -7334,7 +7334,7 @@ static IrInstruction *ir_gen_switch_expr(IrBuilder *irb, Scope *scope, AstNode *
result_instruction = ir_build_phi(irb, scope, node, incoming_blocks.length, result_instruction = ir_build_phi(irb, scope, node, incoming_blocks.length,
incoming_blocks.items, incoming_values.items, peer_parent); incoming_blocks.items, incoming_values.items, peer_parent);
} }
return ir_expr_wrap(irb, scope, result_instruction, result_loc); return ir_lval_wrap(irb, scope, result_instruction, lval, result_loc);
} }
static IrInstruction *ir_gen_comptime(IrBuilder *irb, Scope *parent_scope, AstNode *node, LVal lval) { static IrInstruction *ir_gen_comptime(IrBuilder *irb, Scope *parent_scope, AstNode *node, LVal lval) {

15
test/stage1/behavior/switch.zig
View File

@ -376,3 +376,18 @@ test "return result loc and then switch with range implicit casted to error unio
S.doTheTest(); S.doTheTest();
comptime S.doTheTest(); comptime S.doTheTest();
} }
test "switch with null and T peer types and inferred result location type" {
const S = struct {
fn doTheTest(c: u8) void {
if (switch (c) {
0 => true,
else => null,
}) |v| {
@panic("fail");
}
}
};
S.doTheTest(1);
comptime S.doTheTest(1);
}