mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-18 04:03:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

stage2: detect duplicate enum values

Browse Source 
Closes #12805
This commit is contained in:
Jacob G-W 2022-09-11 19:08:02 -04:00 committed by Veikka Tuominen
parent e165b8b223
commit 0a064eae99
2 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/Sema.zig
View File

@ -2691,11 +2691,11 @@ fn zirEnumDecl(
// This string needs to outlive the ZIR code. // This string needs to outlive the ZIR code.
const field_name = try decl_arena_allocator.dupe(u8, field_name_zir); const field_name = try decl_arena_allocator.dupe(u8, field_name_zir);
const gop = enum_obj.fields.getOrPutAssumeCapacity(field_name); const gop_field = enum_obj.fields.getOrPutAssumeCapacity(field_name);
if (gop.found_existing) { if (gop_field.found_existing) {
const tree = try sema.getAstTree(block); const tree = try sema.getAstTree(block);
const field_src = enumFieldSrcLoc(sema.mod.declPtr(block.src_decl), tree.*, src.node_offset.x, field_i); const field_src = enumFieldSrcLoc(sema.mod.declPtr(block.src_decl), tree.*, src.node_offset.x, field_i);
const other_tag_src = enumFieldSrcLoc(sema.mod.declPtr(block.src_decl), tree.*, src.node_offset.x, gop.index); const other_tag_src = enumFieldSrcLoc(sema.mod.declPtr(block.src_decl), tree.*, src.node_offset.x, gop_field.index);
const msg = msg: { const msg = msg: {
const msg = try sema.errMsg(block, field_src, "duplicate enum field '{s}'", .{field_name}); const msg = try sema.errMsg(block, field_src, "duplicate enum field '{s}'", .{field_name});
errdefer msg.destroy(gpa); errdefer msg.destroy(gpa);
@ -2714,10 +2714,22 @@ fn zirEnumDecl(
const tag_val = (try sema.resolveInstConst(block, src, tag_val_ref, "enum tag value must be comptime known")).val; const tag_val = (try sema.resolveInstConst(block, src, tag_val_ref, "enum tag value must be comptime known")).val;
last_tag_val = tag_val; last_tag_val = tag_val;
const copied_tag_val = try tag_val.copy(decl_arena_allocator); const copied_tag_val = try tag_val.copy(decl_arena_allocator);
enum_obj.values.putAssumeCapacityNoClobberContext(copied_tag_val, {}, .{ const gop_val = enum_obj.values.getOrPutAssumeCapacityContext(copied_tag_val, .{
.ty = enum_obj.tag_ty, .ty = enum_obj.tag_ty,
.mod = mod, .mod = mod,
}); });
if (gop_val.found_existing) {
const tree = try sema.getAstTree(block);
const field_src = enumFieldSrcLoc(sema.mod.declPtr(block.src_decl), tree.*, src.node_offset.x, field_i);
const other_field_src = enumFieldSrcLoc(sema.mod.declPtr(block.src_decl), tree.*, src.node_offset.x, gop_val.index);
const msg = msg: {
const msg = try sema.errMsg(block, field_src, "enum tag value {} already taken", .{tag_val.fmtValue(enum_obj.tag_ty, sema.mod)});
errdefer msg.destroy(gpa);
try sema.errNote(block, other_field_src, msg, "other occurrence here", .{});
break :msg msg;
};
return sema.failWithOwnedErrorMsg(msg);
}
} else if (any_values) { } else if (any_values) {
const tag_val = if (last_tag_val) |val| const tag_val = if (last_tag_val) |val|
try sema.intAdd(block, src, val, Value.one, enum_obj.tag_ty) try sema.intAdd(block, src, val, Value.one, enum_obj.tag_ty)
@ -2725,10 +2737,22 @@ fn zirEnumDecl(
Value.zero; Value.zero;
last_tag_val = tag_val; last_tag_val = tag_val;
const copied_tag_val = try tag_val.copy(decl_arena_allocator); const copied_tag_val = try tag_val.copy(decl_arena_allocator);
enum_obj.values.putAssumeCapacityNoClobberContext(copied_tag_val, {}, .{ const gop_val = enum_obj.values.getOrPutAssumeCapacityContext(copied_tag_val, .{
.ty = enum_obj.tag_ty, .ty = enum_obj.tag_ty,
.mod = mod, .mod = mod,
}); });
if (gop_val.found_existing) {
const tree = try sema.getAstTree(block);
const field_src = enumFieldSrcLoc(sema.mod.declPtr(block.src_decl), tree.*, src.node_offset.x, field_i);
const other_field_src = enumFieldSrcLoc(sema.mod.declPtr(block.src_decl), tree.*, src.node_offset.x, gop_val.index);
const msg = msg: {
const msg = try sema.errMsg(block, field_src, "enum tag value {} already taken", .{tag_val.fmtValue(enum_obj.tag_ty, sema.mod)});
errdefer msg.destroy(gpa);
try sema.errNote(block, other_field_src, msg, "other occurrence here", .{});
break :msg msg;
};
return sema.failWithOwnedErrorMsg(msg);
}
} else { } else {
tag_val_buf = .{ tag_val_buf = .{
.base = .{ .tag = .int_u64 }, .base = .{ .tag = .int_u64 },

6
test/cases/compile_errors/stage1/obj/enum_value_already_taken.zig → test/cases/compile_errors/enum_value_already_taken.zig
View File

@ -11,8 +11,8 @@ export fn entry() void {
} }
// error // error
// backend=stage1 // backend=stage2
// target=native // target=native
// //
// tmp.zig:6:5: error: enum tag value 60 already taken // :6:5: error: enum tag value 60 already taken
// tmp.zig:4:5: note: other occurrence here // :4:5: note: other occurrence here