authorgravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2023-01-24 13:35:10+02:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-10-16 04:08:45-04:00
log78855bd21866b515018259a2194e036e4b3120df
tree9d5df7cd0e5d909163475a5bdb30c94794460321
parentfbd90e487b4abe32422dc997467b1d81ad574d5d

make distinct error limit configurable

Closes #786

5 files changed, 81 insertions(+), 28 deletions(-)

src/Compilation.zig+23
......@@ -739,6 +739,7 @@ pub const InitOptions = struct {
739739 pdb_source_path: ?[]const u8 = null,
740740 /// (Windows) PDB output path
741741 pdb_out_path: ?[]const u8 = null,
742 error_limit: ?Module.ErrorInt = null,
742743};
743744
744745fn addModuleTableToCacheHash(
......@@ -1418,6 +1419,7 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation {
14181419 .local_zir_cache = local_zir_cache,
14191420 .emit_h = emit_h,
14201421 .tmp_hack_arena = std.heap.ArenaAllocator.init(gpa),
1422 .error_limit = options.error_limit orelse (std.math.maxInt(u16) - 1),
14211423 };
14221424 try module.init();
14231425
......@@ -2472,6 +2474,7 @@ fn addNonIncrementalStuffToCacheManifest(comp: *Compilation, man: *Cache.Manifes
24722474 man.hash.add(comp.bin_file.options.skip_linker_dependencies);
24732475 man.hash.add(comp.bin_file.options.parent_compilation_link_libc);
24742476 man.hash.add(mod.emit_h != null);
2477 man.hash.add(mod.error_limit);
24752478 }
24762479
24772480 try man.addOptionalFile(comp.bin_file.options.linker_script);
......@@ -2852,6 +2855,10 @@ pub fn totalErrorCount(self: *Compilation) u32 {
28522855 }
28532856 }
28542857 }
2858
2859 if (module.global_error_set.entries.len - 1 > module.error_limit) {
2860 total += 1;
2861 }
28552862 }
28562863
28572864 // The "no entry point found" error only counts if there are no semantic analysis errors.
......@@ -3002,6 +3009,22 @@ pub fn getAllErrorsAlloc(self: *Compilation) !ErrorBundle {
30023009 for (module.failed_exports.values()) |value| {
30033010 try addModuleErrorMsg(module, &bundle, value.*);
30043011 }
3012
3013 const actual_error_count = module.global_error_set.entries.len - 1;
3014 if (actual_error_count > module.error_limit) {
3015 try bundle.addRootErrorMessage(.{
3016 .msg = try bundle.printString("module used more errors than possible: used {d}, max {d}", .{
3017 actual_error_count, module.error_limit,
3018 }),
3019 .notes_len = 1,
3020 });
3021 const notes_start = try bundle.reserveNotes(1);
3022 bundle.extra.items[notes_start] = @intFromEnum(try bundle.addErrorMessage(.{
3023 .msg = try bundle.printString("use '--error-limit {d}' to increase limit", .{
3024 actual_error_count,
3025 }),
3026 }));
3027 }
30053028 }
30063029
30073030 if (bundle.root_list.items.len == 0) {
src/Module.zig+8
......@@ -137,6 +137,9 @@ deletion_set: std.AutoArrayHashMapUnmanaged(Decl.Index, void) = .{},
137137/// Key is the error name, index is the error tag value. Index 0 has a length-0 string.
138138global_error_set: GlobalErrorSet = .{},
139139
140/// Maximum amount of distinct error values, set by --error-limit
141error_limit: ErrorInt,
142
140143/// Incrementing integer used to compare against the corresponding Decl
141144/// field to determine whether a Decl's status applies to an ongoing update, or a
142145/// previous analysis.
......@@ -5020,6 +5023,11 @@ pub fn getErrorValueFromSlice(
50205023 return getErrorValue(mod, interned_name);
50215024}
50225025
5026pub fn errorSetBits(mod: *Module) u16 {
5027 if (mod.error_limit == 0) return 0;
5028 return std.math.log2_int_ceil(ErrorInt, mod.error_limit + 1); // +1 for no error
5029}
5030
50235031pub fn createAnonymousDecl(mod: *Module, block: *Sema.Block, typed_value: TypedValue) !Decl.Index {
50245032 const src_decl = mod.declPtr(block.src_decl);
50255033 return mod.createAnonymousDeclFromDecl(src_decl, block.namespace, block.wip_capture_scope, typed_value);
src/main.zig+9
......@@ -420,6 +420,7 @@ const usage_build_generic =
420420 \\ --deps [dep],[dep],... Set dependency names for the root package
421421 \\ dep: [[import=]name]
422422 \\ --main-mod-path Set the directory of the root module
423 \\ --error-limit [num] Set the maximum amount of distinct error values
423424 \\ -fPIC Force-enable Position Independent Code
424425 \\ -fno-PIC Force-disable Position Independent Code
425426 \\ -fPIE Force-enable Position Independent Executable
......@@ -921,6 +922,8 @@ fn buildOutputType(
921922 var error_tracing: ?bool = null;
922923 var pdb_out_path: ?[]const u8 = null;
923924 var dwarf_format: ?std.dwarf.Format = null;
925 var error_limit: ?Module.ErrorInt = null;
926
924927 // e.g. -m3dnow or -mno-outline-atomics. They correspond to std.Target llvm cpu feature names.
925928 // This array is populated by zig cc frontend and then has to be converted to zig-style
926929 // CPU features.
......@@ -1050,6 +1053,11 @@ fn buildOutputType(
10501053 root_deps_str = args_iter.nextOrFatal();
10511054 } else if (mem.eql(u8, arg, "--main-mod-path")) {
10521055 main_mod_path = args_iter.nextOrFatal();
1056 } else if (mem.eql(u8, arg, "--error-limit")) {
1057 const next_arg = args_iter.nextOrFatal();
1058 error_limit = std.fmt.parseUnsigned(Module.ErrorInt, next_arg, 0) catch |err| {
1059 fatal("unable to parse error limit '{s}': {s}", .{ next_arg, @errorName(err) });
1060 };
10531061 } else if (mem.eql(u8, arg, "-cflags")) {
10541062 extra_cflags.shrinkRetainingCapacity(0);
10551063 while (true) {
......@@ -3556,6 +3564,7 @@ fn buildOutputType(
35563564 .reference_trace = reference_trace,
35573565 .error_tracing = error_tracing,
35583566 .pdb_out_path = pdb_out_path,
3567 .error_limit = error_limit,
35593568 }) catch |err| switch (err) {
35603569 error.LibCUnavailable => {
35613570 const target = target_info.target;
src/type.zig+26-20
......@@ -905,8 +905,11 @@ pub const Type = struct {
905905 .opt_type => return abiAlignmentAdvancedOptional(ty, mod, strat),
906906 .error_union_type => |info| return abiAlignmentAdvancedErrorUnion(ty, mod, strat, info.payload_type.toType()),
907907
908 // TODO revisit this when we have the concept of the error tag type
909 .error_set_type, .inferred_error_set_type => return .{ .scalar = .@"2" },
908 .error_set_type, .inferred_error_set_type => {
909 const bits = mod.errorSetBits();
910 if (bits == 0) return AbiAlignmentAdvanced{ .scalar = .@"1" };
911 return .{ .scalar = intAbiAlignment(bits, target) };
912 },
910913
911914 // represents machine code; not a pointer
912915 .func_type => |func_type| return .{
......@@ -967,10 +970,11 @@ pub const Type = struct {
967970 else => return .{ .scalar = .@"16" },
968971 },
969972
970 // TODO revisit this when we have the concept of the error tag type
971 .anyerror,
972 .adhoc_inferred_error_set,
973 => return .{ .scalar = .@"2" },
973 .anyerror, .adhoc_inferred_error_set => {
974 const bits = mod.errorSetBits();
975 if (bits == 0) return AbiAlignmentAdvanced{ .scalar = .@"1" };
976 return .{ .scalar = intAbiAlignment(bits, target) };
977 },
974978
975979 .void,
976980 .type,
......@@ -1284,8 +1288,11 @@ pub const Type = struct {
12841288
12851289 .opt_type => return ty.abiSizeAdvancedOptional(mod, strat),
12861290
1287 // TODO revisit this when we have the concept of the error tag type
1288 .error_set_type, .inferred_error_set_type => return AbiSizeAdvanced{ .scalar = 2 },
1291 .error_set_type, .inferred_error_set_type => {
1292 const bits = mod.errorSetBits();
1293 if (bits == 0) return AbiSizeAdvanced{ .scalar = 0 };
1294 return AbiSizeAdvanced{ .scalar = intAbiSize(bits, target) };
1295 },
12891296
12901297 .error_union_type => |error_union_type| {
12911298 const payload_ty = error_union_type.payload_type.toType();
......@@ -1379,10 +1386,11 @@ pub const Type = struct {
13791386 .enum_literal,
13801387 => return AbiSizeAdvanced{ .scalar = 0 },
13811388
1382 // TODO revisit this when we have the concept of the error tag type
1383 .anyerror,
1384 .adhoc_inferred_error_set,
1385 => return AbiSizeAdvanced{ .scalar = 2 },
1389 .anyerror, .adhoc_inferred_error_set => {
1390 const bits = mod.errorSetBits();
1391 if (bits == 0) return AbiSizeAdvanced{ .scalar = 0 };
1392 return AbiSizeAdvanced{ .scalar = intAbiSize(bits, target) };
1393 },
13861394
13871395 .prefetch_options => unreachable, // missing call to resolveTypeFields
13881396 .export_options => unreachable, // missing call to resolveTypeFields
......@@ -1576,8 +1584,7 @@ pub const Type = struct {
15761584 return (try abiSizeAdvanced(ty, mod, strat)).scalar * 8;
15771585 },
15781586
1579 // TODO revisit this when we have the concept of the error tag type
1580 .error_set_type, .inferred_error_set_type => return 16,
1587 .error_set_type, .inferred_error_set_type => return mod.errorSetBits(),
15811588
15821589 .error_union_type => {
15831590 // Optionals and error unions are not packed so their bitsize
......@@ -1610,10 +1617,9 @@ pub const Type = struct {
16101617 .bool => return 1,
16111618 .void => return 0,
16121619
1613 // TODO revisit this when we have the concept of the error tag type
16141620 .anyerror,
16151621 .adhoc_inferred_error_set,
1616 => return 16,
1622 => return mod.errorSetBits(),
16171623
16181624 .anyopaque => unreachable,
16191625 .type => unreachable,
......@@ -2172,8 +2178,7 @@ pub const Type = struct {
21722178
21732179 while (true) switch (ty.toIntern()) {
21742180 .anyerror_type, .adhoc_inferred_error_set_type => {
2175 // TODO revisit this when error sets support custom int types
2176 return .{ .signedness = .unsigned, .bits = 16 };
2181 return .{ .signedness = .unsigned, .bits = mod.errorSetBits() };
21772182 },
21782183 .usize_type => return .{ .signedness = .unsigned, .bits = target.ptrBitWidth() },
21792184 .isize_type => return .{ .signedness = .signed, .bits = target.ptrBitWidth() },
......@@ -2192,8 +2197,9 @@ pub const Type = struct {
21922197 .enum_type => |enum_type| ty = enum_type.tag_ty.toType(),
21932198 .vector_type => |vector_type| ty = vector_type.child.toType(),
21942199
2195 // TODO revisit this when error sets support custom int types
2196 .error_set_type, .inferred_error_set_type => return .{ .signedness = .unsigned, .bits = 16 },
2200 .error_set_type, .inferred_error_set_type => {
2201 return .{ .signedness = .unsigned, .bits = mod.errorSetBits() };
2202 },
21972203
21982204 .anon_struct_type => unreachable,
21992205
src/value.zig+15-8
......@@ -701,15 +701,20 @@ pub const Value = struct {
701701 }
702702 },
703703 .ErrorSet => {
704 // TODO revisit this when we have the concept of the error tag type
705 const Int = u16;
704 const bits = mod.errorSetBits();
705 const byte_count: u16 = @intCast((@as(u17, bits) + 7) / 8);
706
706707 const name = switch (ip.indexToKey(val.toIntern())) {
707708 .err => |err| err.name,
708709 .error_union => |error_union| error_union.val.err_name,
709710 else => unreachable,
710711 };
711 const int = @as(Module.ErrorInt, @intCast(mod.global_error_set.getIndex(name).?));
712 std.mem.writeInt(Int, buffer[0..@sizeOf(Int)], @as(Int, @intCast(int)), endian);
712 var bigint_buffer: BigIntSpace = undefined;
713 const bigint = BigIntMutable.init(
714 &bigint_buffer.limbs,
715 mod.global_error_set.getIndex(name).?,
716 ).toConst();
717 bigint.writeTwosComplement(buffer[0..byte_count], endian);
713718 },
714719 .Union => switch (ty.containerLayout(mod)) {
715720 .Auto => return error.IllDefinedMemoryLayout, // Sema is supposed to have emitted a compile error already
......@@ -987,10 +992,12 @@ pub const Value = struct {
987992 }
988993 },
989994 .ErrorSet => {
990 // TODO revisit this when we have the concept of the error tag type
991 const Int = u16;
992 const int = std.mem.readInt(Int, buffer[0..@sizeOf(Int)], endian);
993 const name = mod.global_error_set.keys()[@as(usize, @intCast(int))];
995 const bits = mod.errorSetBits();
996 const byte_count: u16 = @intCast((@as(u17, bits) + 7) / 8);
997 const int = std.mem.readVarInt(u64, buffer[0..byte_count], endian);
998 const index = (int << @as(u6, @intCast(64 - bits))) >> @as(u6, @intCast(64 - bits));
999 const name = mod.global_error_set.keys()[@intCast(index)];
1000
9941001 return (try mod.intern(.{ .err = .{
9951002 .ty = ty.toIntern(),
9961003 .name = name,