mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-30 03:03:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sema: correctly detect union target in zirSwitchBlock

Browse Source 
Closes #13655
This commit is contained in:
Veikka Tuominen 2022-11-26 18:04:07 +02:00
parent fe38898246
commit 71937f75d8
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Sema.zig
View File

@ -9698,10 +9698,12 @@ fn zirSwitchBlock(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError
};
const maybe_union_ty = blk: {
const zir_tags = sema.code.instructions.items(.tag);
const zir_data = sema.code.instructions.items(.data);
const cond_index = Zir.refToIndex(extra.data.operand).?;
const raw_operand = sema.resolveInst(zir_data[cond_index].un_node.operand) catch unreachable;
break :blk sema.typeOf(raw_operand);
const target_ty = sema.typeOf(raw_operand);
break :blk if (zir_tags[cond_index] == .switch_cond_ref) target_ty.elemType() else target_ty;
};
const union_originally = maybe_union_ty.zigTypeTag() == .Union;

9
test/behavior/union.zig
View File

@ -1287,7 +1287,14 @@ test "noreturn field in union" {
try expect(a == .a);
},
}
try expect(count == 5);
switch (a) {
.a => count += 1,
.b, .c => |*val| {
_ = val;
@compileError("bad");
},
}
try expect(count == 6);
}
test "union and enum field order doesn't match" {