authorgravatar for mlugg@mlugg.co.ukMatthew Lugg <mlugg@mlugg.co.uk> 2024-02-03 01:22:56+00:00
committergravatar for mlugg@mlugg.co.ukMatthew Lugg <mlugg@mlugg.co.uk> 2024-02-04 18:38:39+00:00
log1e91ee1e05f08013e3a4edec5d9f0aef978f3f0b
tree92f1353ae14a77d14b11897cd9c48484b63bd9c3
parent7f4bd247c7735ccf277c9bba42222e014cacf856
signaturelock-open Commit is signed but in an unrecognized format.

Zir: store extra source hashes required for incremental

Also add corresponding invaidation logic to Zcu. Therefore, the only invalidation logic which is not yet in place is `decl_val` dependencies.

7 files changed, 283 insertions(+), 34 deletions(-)

lib/std/zig.zig+3-2
......@@ -27,11 +27,12 @@ pub const parseNumberLiteral = number_literal.parseNumberLiteral;
2727pub const c_builtins = @import("zig/c_builtins.zig");
2828pub const c_translation = @import("zig/c_translation.zig");
2929
30pub const SrcHasher = std.crypto.hash.Blake3;
3031pub const SrcHash = [16]u8;
3132
3233pub fn hashSrc(src: []const u8) SrcHash {
3334 var out: SrcHash = undefined;
34 std.crypto.hash.Blake3.hash(src, &out, .{});
35 SrcHasher.hash(src, &out, .{});
3536 return out;
3637}
3738
......@@ -41,7 +42,7 @@ pub fn srcHashEql(a: SrcHash, b: SrcHash) bool {
4142
4243pub fn hashName(parent_hash: SrcHash, sep: []const u8, name: []const u8) SrcHash {
4344 var out: SrcHash = undefined;
44 var hasher = std.crypto.hash.Blake3.init(.{});
45 var hasher = SrcHasher.init(.{});
4546 hasher.update(&parent_hash);
4647 hasher.update(sep);
4748 hasher.update(name);
src/AstGen.zig+93-16
......@@ -4815,6 +4815,7 @@ fn structDeclInner(
48154815 .any_comptime_fields = false,
48164816 .any_default_inits = false,
48174817 .any_aligned_fields = false,
4818 .fields_hash = std.zig.hashSrc(@tagName(layout)),
48184819 });
48194820 return decl_inst.toRef();
48204821 }
......@@ -4936,6 +4937,12 @@ fn structDeclInner(
49364937 }
49374938 };
49384939
4940 var fields_hasher = std.zig.SrcHasher.init(.{});
4941 fields_hasher.update(@tagName(layout));
4942 if (backing_int_node != 0) {
4943 fields_hasher.update(tree.getNodeSource(backing_int_node));
4944 }
4945
49394946 var sfba = std.heap.stackFallback(256, astgen.arena);
49404947 const sfba_allocator = sfba.get();
49414948
......@@ -4956,6 +4963,8 @@ fn structDeclInner(
49564963 .field => |field| field,
49574964 };
49584965
4966 fields_hasher.update(tree.getNodeSource(member_node));
4967
49594968 if (!is_tuple) {
49604969 const field_name = try astgen.identAsString(member.ast.main_token);
49614970
......@@ -5083,6 +5092,9 @@ fn structDeclInner(
50835092 return error.AnalysisFail;
50845093 }
50855094
5095 var fields_hash: std.zig.SrcHash = undefined;
5096 fields_hasher.final(&fields_hash);
5097
50865098 try gz.setStruct(decl_inst, .{
50875099 .src_node = node,
50885100 .layout = layout,
......@@ -5096,6 +5108,7 @@ fn structDeclInner(
50965108 .any_comptime_fields = any_comptime_fields,
50975109 .any_default_inits = any_default_inits,
50985110 .any_aligned_fields = any_aligned_fields,
5111 .fields_hash = fields_hash,
50995112 });
51005113
51015114 wip_members.finishBits(bits_per_field);
......@@ -5174,6 +5187,13 @@ fn unionDeclInner(
51745187 var wip_members = try WipMembers.init(gpa, &astgen.scratch, decl_count, field_count, bits_per_field, max_field_size);
51755188 defer wip_members.deinit();
51765189
5190 var fields_hasher = std.zig.SrcHasher.init(.{});
5191 fields_hasher.update(@tagName(layout));
5192 fields_hasher.update(&.{@intFromBool(auto_enum_tok != null)});
5193 if (arg_node != 0) {
5194 fields_hasher.update(astgen.tree.getNodeSource(arg_node));
5195 }
5196
51775197 var sfba = std.heap.stackFallback(256, astgen.arena);
51785198 const sfba_allocator = sfba.get();
51795199
......@@ -5188,6 +5208,7 @@ fn unionDeclInner(
51885208 .decl => continue,
51895209 .field => |field| field,
51905210 };
5211 fields_hasher.update(astgen.tree.getNodeSource(member_node));
51915212 member.convertToNonTupleLike(astgen.tree.nodes);
51925213 if (member.ast.tuple_like) {
51935214 return astgen.failTok(member.ast.main_token, "union field missing name", .{});
......@@ -5289,6 +5310,9 @@ fn unionDeclInner(
52895310 return error.AnalysisFail;
52905311 }
52915312
5313 var fields_hash: std.zig.SrcHash = undefined;
5314 fields_hasher.final(&fields_hash);
5315
52925316 if (!block_scope.isEmpty()) {
52935317 _ = try block_scope.addBreak(.break_inline, decl_inst, .void_value);
52945318 }
......@@ -5305,6 +5329,7 @@ fn unionDeclInner(
53055329 .decls_len = decl_count,
53065330 .auto_enum_tag = auto_enum_tok != null,
53075331 .any_aligned_fields = any_aligned_fields,
5332 .fields_hash = fields_hash,
53085333 });
53095334
53105335 wip_members.finishBits(bits_per_field);
......@@ -5498,6 +5523,12 @@ fn containerDecl(
54985523 var wip_members = try WipMembers.init(gpa, &astgen.scratch, @intCast(counts.decls), @intCast(counts.total_fields), bits_per_field, max_field_size);
54995524 defer wip_members.deinit();
55005525
5526 var fields_hasher = std.zig.SrcHasher.init(.{});
5527 if (container_decl.ast.arg != 0) {
5528 fields_hasher.update(tree.getNodeSource(container_decl.ast.arg));
5529 }
5530 fields_hasher.update(&.{@intFromBool(nonexhaustive)});
5531
55015532 var sfba = std.heap.stackFallback(256, astgen.arena);
55025533 const sfba_allocator = sfba.get();
55035534
......@@ -5510,6 +5541,7 @@ fn containerDecl(
55105541 for (container_decl.ast.members) |member_node| {
55115542 if (member_node == counts.nonexhaustive_node)
55125543 continue;
5544 fields_hasher.update(tree.getNodeSource(member_node));
55135545 namespace.base.tag = .namespace;
55145546 var member = switch (try containerMember(&block_scope, &namespace.base, &wip_members, member_node)) {
55155547 .decl => continue,
......@@ -5590,6 +5622,9 @@ fn containerDecl(
55905622 _ = try block_scope.addBreak(.break_inline, decl_inst, .void_value);
55915623 }
55925624
5625 var fields_hash: std.zig.SrcHash = undefined;
5626 fields_hasher.final(&fields_hash);
5627
55935628 const body = block_scope.instructionsSlice();
55945629 const body_len = astgen.countBodyLenAfterFixups(body);
55955630
......@@ -5600,6 +5635,7 @@ fn containerDecl(
56005635 .body_len = body_len,
56015636 .fields_len = @intCast(counts.total_fields),
56025637 .decls_len = @intCast(counts.decls),
5638 .fields_hash = fields_hash,
56035639 });
56045640
56055641 wip_members.finishBits(bits_per_field);
......@@ -11900,8 +11936,8 @@ const GenZir = struct {
1190011936
1190111937 var body: []Zir.Inst.Index = &[0]Zir.Inst.Index{};
1190211938 var ret_body: []Zir.Inst.Index = &[0]Zir.Inst.Index{};
11903 var src_locs_buffer: [3]u32 = undefined;
11904 var src_locs: []u32 = src_locs_buffer[0..0];
11939 var src_locs_and_hash_buffer: [7]u32 = undefined;
11940 var src_locs_and_hash: []u32 = src_locs_and_hash_buffer[0..0];
1190511941 if (args.body_gz) |body_gz| {
1190611942 const tree = astgen.tree;
1190711943 const node_tags = tree.nodes.items(.tag);
......@@ -11916,10 +11952,27 @@ const GenZir = struct {
1191611952 const rbrace_column: u32 = @intCast(astgen.source_column);
1191711953
1191811954 const columns = args.lbrace_column | (rbrace_column << 16);
11919 src_locs_buffer[0] = args.lbrace_line;
11920 src_locs_buffer[1] = rbrace_line;
11921 src_locs_buffer[2] = columns;
11922 src_locs = &src_locs_buffer;
11955
11956 const proto_hash: std.zig.SrcHash = switch (node_tags[fn_decl]) {
11957 .fn_decl => sig_hash: {
11958 const proto_node = node_datas[fn_decl].lhs;
11959 break :sig_hash std.zig.hashSrc(tree.getNodeSource(proto_node));
11960 },
11961 .test_decl => std.zig.hashSrc(""), // tests don't have a prototype
11962 else => unreachable,
11963 };
11964 const proto_hash_arr: [4]u32 = @bitCast(proto_hash);
11965
11966 src_locs_and_hash_buffer = .{
11967 args.lbrace_line,
11968 rbrace_line,
11969 columns,
11970 proto_hash_arr[0],
11971 proto_hash_arr[1],
11972 proto_hash_arr[2],
11973 proto_hash_arr[3],
11974 };
11975 src_locs_and_hash = &src_locs_and_hash_buffer;
1192311976
1192411977 body = body_gz.instructionsSlice();
1192511978 if (args.ret_gz) |ret_gz|
......@@ -11953,7 +12006,7 @@ const GenZir = struct {
1195312006 fancyFnExprExtraLen(astgen, section_body, args.section_ref) +
1195412007 fancyFnExprExtraLen(astgen, cc_body, args.cc_ref) +
1195512008 fancyFnExprExtraLen(astgen, ret_body, ret_ref) +
11956 body_len + src_locs.len +
12009 body_len + src_locs_and_hash.len +
1195712010 @intFromBool(args.lib_name != .empty) +
1195812011 @intFromBool(args.noalias_bits != 0),
1195912012 );
......@@ -12040,7 +12093,7 @@ const GenZir = struct {
1204012093 }
1204112094
1204212095 astgen.appendBodyWithFixups(body);
12043 astgen.extra.appendSliceAssumeCapacity(src_locs);
12096 astgen.extra.appendSliceAssumeCapacity(src_locs_and_hash);
1204412097
1204512098 // Order is important when unstacking.
1204612099 if (args.body_gz) |body_gz| body_gz.unstack();
......@@ -12068,7 +12121,7 @@ const GenZir = struct {
1206812121 gpa,
1206912122 @typeInfo(Zir.Inst.Func).Struct.fields.len + 1 +
1207012123 fancyFnExprExtraLen(astgen, ret_body, ret_ref) +
12071 body_len + src_locs.len,
12124 body_len + src_locs_and_hash.len,
1207212125 );
1207312126
1207412127 const ret_body_len = if (ret_body.len != 0)
......@@ -12092,7 +12145,7 @@ const GenZir = struct {
1209212145 astgen.extra.appendAssumeCapacity(@intFromEnum(ret_ref));
1209312146 }
1209412147 astgen.appendBodyWithFixups(body);
12095 astgen.extra.appendSliceAssumeCapacity(src_locs);
12148 astgen.extra.appendSliceAssumeCapacity(src_locs_and_hash);
1209612149
1209712150 // Order is important when unstacking.
1209812151 if (args.body_gz) |body_gz| body_gz.unstack();
......@@ -12853,12 +12906,20 @@ const GenZir = struct {
1285312906 any_comptime_fields: bool,
1285412907 any_default_inits: bool,
1285512908 any_aligned_fields: bool,
12909 fields_hash: std.zig.SrcHash,
1285612910 }) !void {
1285712911 const astgen = gz.astgen;
1285812912 const gpa = astgen.gpa;
1285912913
12860 try astgen.extra.ensureUnusedCapacity(gpa, 6);
12861 const payload_index: u32 = @intCast(astgen.extra.items.len);
12914 const fields_hash_arr: [4]u32 = @bitCast(args.fields_hash);
12915
12916 try astgen.extra.ensureUnusedCapacity(gpa, @typeInfo(Zir.Inst.StructDecl).Struct.fields.len + 6);
12917 const payload_index = astgen.addExtraAssumeCapacity(Zir.Inst.StructDecl{
12918 .fields_hash_0 = fields_hash_arr[0],
12919 .fields_hash_1 = fields_hash_arr[1],
12920 .fields_hash_2 = fields_hash_arr[2],
12921 .fields_hash_3 = fields_hash_arr[3],
12922 });
1286212923
1286312924 if (args.src_node != 0) {
1286412925 const node_offset = gz.nodeIndexToRelative(args.src_node);
......@@ -12908,12 +12969,20 @@ const GenZir = struct {
1290812969 layout: std.builtin.Type.ContainerLayout,
1290912970 auto_enum_tag: bool,
1291012971 any_aligned_fields: bool,
12972 fields_hash: std.zig.SrcHash,
1291112973 }) !void {
1291212974 const astgen = gz.astgen;
1291312975 const gpa = astgen.gpa;
1291412976
12915 try astgen.extra.ensureUnusedCapacity(gpa, 5);
12916 const payload_index: u32 = @intCast(astgen.extra.items.len);
12977 const fields_hash_arr: [4]u32 = @bitCast(args.fields_hash);
12978
12979 try astgen.extra.ensureUnusedCapacity(gpa, @typeInfo(Zir.Inst.UnionDecl).Struct.fields.len + 5);
12980 const payload_index = astgen.addExtraAssumeCapacity(Zir.Inst.UnionDecl{
12981 .fields_hash_0 = fields_hash_arr[0],
12982 .fields_hash_1 = fields_hash_arr[1],
12983 .fields_hash_2 = fields_hash_arr[2],
12984 .fields_hash_3 = fields_hash_arr[3],
12985 });
1291712986
1291812987 if (args.src_node != 0) {
1291912988 const node_offset = gz.nodeIndexToRelative(args.src_node);
......@@ -12958,12 +13027,20 @@ const GenZir = struct {
1295813027 fields_len: u32,
1295913028 decls_len: u32,
1296013029 nonexhaustive: bool,
13030 fields_hash: std.zig.SrcHash,
1296113031 }) !void {
1296213032 const astgen = gz.astgen;
1296313033 const gpa = astgen.gpa;
1296413034
12965 try astgen.extra.ensureUnusedCapacity(gpa, 5);
12966 const payload_index: u32 = @intCast(astgen.extra.items.len);
13035 const fields_hash_arr: [4]u32 = @bitCast(args.fields_hash);
13036
13037 try astgen.extra.ensureUnusedCapacity(gpa, @typeInfo(Zir.Inst.EnumDecl).Struct.fields.len + 5);
13038 const payload_index = astgen.addExtraAssumeCapacity(Zir.Inst.EnumDecl{
13039 .fields_hash_0 = fields_hash_arr[0],
13040 .fields_hash_1 = fields_hash_arr[1],
13041 .fields_hash_2 = fields_hash_arr[2],
13042 .fields_hash_3 = fields_hash_arr[3],
13043 });
1296713044
1296813045 if (args.src_node != 0) {
1296913046 const node_offset = gz.nodeIndexToRelative(args.src_node);
src/Autodoc.zig+3-3
......@@ -3497,7 +3497,7 @@ fn walkInstruction(
34973497 };
34983498
34993499 const small = @as(Zir.Inst.UnionDecl.Small, @bitCast(extended.small));
3500 var extra_index: usize = extended.operand;
3500 var extra_index: usize = extended.operand + @typeInfo(Zir.Inst.UnionDecl).Struct.fields.len;
35013501
35023502 const src_node: ?i32 = if (small.has_src_node) blk: {
35033503 const src_node = @as(i32, @bitCast(file.zir.extra[extra_index]));
......@@ -3627,7 +3627,7 @@ fn walkInstruction(
36273627 };
36283628
36293629 const small = @as(Zir.Inst.EnumDecl.Small, @bitCast(extended.small));
3630 var extra_index: usize = extended.operand;
3630 var extra_index: usize = extended.operand + @typeInfo(Zir.Inst.EnumDecl).Struct.fields.len;
36313631
36323632 const src_node: ?i32 = if (small.has_src_node) blk: {
36333633 const src_node = @as(i32, @bitCast(file.zir.extra[extra_index]));
......@@ -3778,7 +3778,7 @@ fn walkInstruction(
37783778 };
37793779
37803780 const small = @as(Zir.Inst.StructDecl.Small, @bitCast(extended.small));
3781 var extra_index: usize = extended.operand;
3781 var extra_index: usize = extended.operand + @typeInfo(Zir.Inst.StructDecl).Struct.fields.len;
37823782
37833783 const src_node: ?i32 = if (small.has_src_node) blk: {
37843784 const src_node = @as(i32, @bitCast(file.zir.extra[extra_index]));
src/Module.zig+12
......@@ -2957,6 +2957,18 @@ fn updateZirRefs(zcu: *Module, file: *File, old_zir: Zir) !void {
29572957 continue;
29582958 };
29592959
2960 if (old_zir.getAssociatedSrcHash(old_inst)) |old_hash| hash_changed: {
2961 if (new_zir.getAssociatedSrcHash(ti.inst)) |new_hash| {
2962 if (std.zig.srcHashEql(old_hash, new_hash)) {
2963 break :hash_changed;
2964 }
2965 }
2966 // The source hash associated with this instruction changed - invalidate relevant dependencies.
2967 zcu.comp.mutex.lock();
2968 defer zcu.comp.mutex.unlock();
2969 try zcu.markDependeeOutdated(.{ .src_hash = ti_idx });
2970 }
2971
29602972 // If this is a `struct_decl` etc, we must invalidate any outdated namespace dependencies.
29612973 const has_namespace = switch (old_tag[@intFromEnum(old_inst)]) {
29622974 .extended => switch (old_data[@intFromEnum(old_inst)].extended.opcode) {
src/Sema.zig+7-7
......@@ -2718,7 +2718,7 @@ pub fn getStructType(
27182718 assert(extended.opcode == .struct_decl);
27192719 const small: Zir.Inst.StructDecl.Small = @bitCast(extended.small);
27202720
2721 var extra_index: usize = extended.operand;
2721 var extra_index: usize = extended.operand + @typeInfo(Zir.Inst.StructDecl).Struct.fields.len;
27222722 extra_index += @intFromBool(small.has_src_node);
27232723 const fields_len = if (small.has_fields_len) blk: {
27242724 const fields_len = sema.code.extra[extra_index];
......@@ -2773,7 +2773,7 @@ fn zirStructDecl(
27732773 const ip = &mod.intern_pool;
27742774 const small: Zir.Inst.StructDecl.Small = @bitCast(extended.small);
27752775 const src: LazySrcLoc = if (small.has_src_node) blk: {
2776 const node_offset: i32 = @bitCast(sema.code.extra[extended.operand]);
2776 const node_offset: i32 = @bitCast(sema.code.extra[extended.operand + @typeInfo(Zir.Inst.StructDecl).Struct.fields.len]);
27772777 break :blk LazySrcLoc.nodeOffset(node_offset);
27782778 } else sema.src;
27792779
......@@ -2933,7 +2933,7 @@ fn zirEnumDecl(
29332933 const mod = sema.mod;
29342934 const gpa = sema.gpa;
29352935 const small: Zir.Inst.EnumDecl.Small = @bitCast(extended.small);
2936 var extra_index: usize = extended.operand;
2936 var extra_index: usize = extended.operand + @typeInfo(Zir.Inst.EnumDecl).Struct.fields.len;
29372937
29382938 const src: LazySrcLoc = if (small.has_src_node) blk: {
29392939 const node_offset: i32 = @bitCast(sema.code.extra[extra_index]);
......@@ -3204,7 +3204,7 @@ fn zirUnionDecl(
32043204 const mod = sema.mod;
32053205 const gpa = sema.gpa;
32063206 const small: Zir.Inst.UnionDecl.Small = @bitCast(extended.small);
3207 var extra_index: usize = extended.operand;
3207 var extra_index: usize = extended.operand + @typeInfo(Zir.Inst.UnionDecl).Struct.fields.len;
32083208
32093209 const src: LazySrcLoc = if (small.has_src_node) blk: {
32103210 const node_offset: i32 = @bitCast(sema.code.extra[extra_index]);
......@@ -35742,7 +35742,7 @@ fn semaBackingIntType(mod: *Module, struct_type: InternPool.Key.StructType) Comp
3574235742 const small: Zir.Inst.StructDecl.Small = @bitCast(extended.small);
3574335743
3574435744 if (small.has_backing_int) {
35745 var extra_index: usize = extended.operand;
35745 var extra_index: usize = extended.operand + @typeInfo(Zir.Inst.StructDecl).Struct.fields.len;
3574635746 extra_index += @intFromBool(small.has_src_node);
3574735747 extra_index += @intFromBool(small.has_fields_len);
3574835748 extra_index += @intFromBool(small.has_decls_len);
......@@ -36457,7 +36457,7 @@ fn structZirInfo(zir: Zir, zir_index: Zir.Inst.Index) struct {
3645736457 const extended = zir.instructions.items(.data)[@intFromEnum(zir_index)].extended;
3645836458 assert(extended.opcode == .struct_decl);
3645936459 const small: Zir.Inst.StructDecl.Small = @bitCast(extended.small);
36460 var extra_index: usize = extended.operand;
36460 var extra_index: usize = extended.operand + @typeInfo(Zir.Inst.StructDecl).Struct.fields.len;
3646136461
3646236462 extra_index += @intFromBool(small.has_src_node);
3646336463
......@@ -36925,7 +36925,7 @@ fn semaUnionFields(mod: *Module, arena: Allocator, union_type: InternPool.Key.Un
3692536925 const extended = zir.instructions.items(.data)[@intFromEnum(zir_index)].extended;
3692636926 assert(extended.opcode == .union_decl);
3692736927 const small: Zir.Inst.UnionDecl.Small = @bitCast(extended.small);
36928 var extra_index: usize = extended.operand;
36928 var extra_index: usize = extended.operand + @typeInfo(Zir.Inst.UnionDecl).Struct.fields.len;
3692936929
3693036930 const src = LazySrcLoc.nodeOffset(0);
3693136931 extra_index += @intFromBool(small.has_src_node);
src/Zir.zig+131-3
......@@ -2497,6 +2497,7 @@ pub const Inst = struct {
24972497 /// }
24982498 /// 2. body: Index // for each body_len
24992499 /// 3. src_locs: SrcLocs // if body_len != 0
2500 /// 4. proto_hash: std.zig.SrcHash // if body_len != 0; hash of function prototype
25002501 pub const Func = struct {
25012502 /// If this is 0 it means a void return type.
25022503 /// If this is 1 it means return_type is a simple Ref
......@@ -2558,6 +2559,7 @@ pub const Inst = struct {
25582559 /// - each bit starting with LSB corresponds to parameter indexes
25592560 /// 17. body: Index // for each body_len
25602561 /// 18. src_locs: Func.SrcLocs // if body_len != 0
2562 /// 19. proto_hash: std.zig.SrcHash // if body_len != 0; hash of function prototype
25612563 pub const FuncFancy = struct {
25622564 /// Points to the block that contains the param instructions for this function.
25632565 /// If this is a `declaration`, it refers to the declaration's value body.
......@@ -3040,6 +3042,12 @@ pub const Inst = struct {
30403042 /// init_body_inst: Inst, // for each init_body_len
30413043 /// }
30423044 pub const StructDecl = struct {
3045 // These fields should be concatenated and reinterpreted as a `std.zig.SrcHash`.
3046 // This hash contains the source of all fields, and any specified attributes (`extern`, backing type, etc).
3047 fields_hash_0: u32,
3048 fields_hash_1: u32,
3049 fields_hash_2: u32,
3050 fields_hash_3: u32,
30433051 pub const Small = packed struct {
30443052 has_src_node: bool,
30453053 has_fields_len: bool,
......@@ -3102,6 +3110,12 @@ pub const Inst = struct {
31023110 /// value: Ref, // if corresponding bit is set
31033111 /// }
31043112 pub const EnumDecl = struct {
3113 // These fields should be concatenated and reinterpreted as a `std.zig.SrcHash`.
3114 // This hash contains the source of all fields, and the backing type if specified.
3115 fields_hash_0: u32,
3116 fields_hash_1: u32,
3117 fields_hash_2: u32,
3118 fields_hash_3: u32,
31053119 pub const Small = packed struct {
31063120 has_src_node: bool,
31073121 has_tag_type: bool,
......@@ -3137,6 +3151,12 @@ pub const Inst = struct {
31373151 /// tag_value: Ref, // if corresponding bit is set
31383152 /// }
31393153 pub const UnionDecl = struct {
3154 // These fields should be concatenated and reinterpreted as a `std.zig.SrcHash`.
3155 // This hash contains the source of all fields, and any specified attributes (`extern` etc).
3156 fields_hash_0: u32,
3157 fields_hash_1: u32,
3158 fields_hash_2: u32,
3159 fields_hash_3: u32,
31403160 pub const Small = packed struct {
31413161 has_src_node: bool,
31423162 has_tag_type: bool,
......@@ -3455,7 +3475,7 @@ pub fn declIterator(zir: Zir, decl_inst: Zir.Inst.Index) DeclIterator {
34553475 switch (extended.opcode) {
34563476 .struct_decl => {
34573477 const small: Inst.StructDecl.Small = @bitCast(extended.small);
3458 var extra_index: u32 = extended.operand;
3478 var extra_index: u32 = @intCast(extended.operand + @typeInfo(Inst.StructDecl).Struct.fields.len);
34593479 extra_index += @intFromBool(small.has_src_node);
34603480 extra_index += @intFromBool(small.has_fields_len);
34613481 const decls_len = if (small.has_decls_len) decls_len: {
......@@ -3482,7 +3502,7 @@ pub fn declIterator(zir: Zir, decl_inst: Zir.Inst.Index) DeclIterator {
34823502 },
34833503 .enum_decl => {
34843504 const small: Inst.EnumDecl.Small = @bitCast(extended.small);
3485 var extra_index: u32 = extended.operand;
3505 var extra_index: u32 = @intCast(extended.operand + @typeInfo(Inst.EnumDecl).Struct.fields.len);
34863506 extra_index += @intFromBool(small.has_src_node);
34873507 extra_index += @intFromBool(small.has_tag_type);
34883508 extra_index += @intFromBool(small.has_body_len);
......@@ -3501,7 +3521,7 @@ pub fn declIterator(zir: Zir, decl_inst: Zir.Inst.Index) DeclIterator {
35013521 },
35023522 .union_decl => {
35033523 const small: Inst.UnionDecl.Small = @bitCast(extended.small);
3504 var extra_index: u32 = extended.operand;
3524 var extra_index: u32 = @intCast(extended.operand + @typeInfo(Inst.UnionDecl).Struct.fields.len);
35053525 extra_index += @intFromBool(small.has_src_node);
35063526 extra_index += @intFromBool(small.has_tag_type);
35073527 extra_index += @intFromBool(small.has_body_len);
......@@ -3938,3 +3958,111 @@ pub fn getDeclaration(zir: Zir, inst: Zir.Inst.Index) struct { Inst.Declaration,
39383958 @intCast(extra.end),
39393959 };
39403960}
3961
3962pub fn getAssociatedSrcHash(zir: Zir, inst: Zir.Inst.Index) ?std.zig.SrcHash {
3963 const tag = zir.instructions.items(.tag);
3964 const data = zir.instructions.items(.data);
3965 switch (tag[@intFromEnum(inst)]) {
3966 .declaration => {
3967 const pl_node = data[@intFromEnum(inst)].pl_node;
3968 const extra = zir.extraData(Inst.Declaration, pl_node.payload_index);
3969 return @bitCast([4]u32{
3970 extra.data.src_hash_0,
3971 extra.data.src_hash_1,
3972 extra.data.src_hash_2,
3973 extra.data.src_hash_3,
3974 });
3975 },
3976 .func, .func_inferred => {
3977 const pl_node = data[@intFromEnum(inst)].pl_node;
3978 const extra = zir.extraData(Inst.Func, pl_node.payload_index);
3979 if (extra.data.body_len == 0) {
3980 // Function type or extern fn - no associated hash
3981 return null;
3982 }
3983 const extra_index = extra.end +
3984 1 +
3985 extra.data.body_len +
3986 @typeInfo(Inst.Func.SrcLocs).Struct.fields.len;
3987 return @bitCast([4]u32{
3988 zir.extra[extra_index + 0],
3989 zir.extra[extra_index + 1],
3990 zir.extra[extra_index + 2],
3991 zir.extra[extra_index + 3],
3992 });
3993 },
3994 .func_fancy => {
3995 const pl_node = data[@intFromEnum(inst)].pl_node;
3996 const extra = zir.extraData(Inst.FuncFancy, pl_node.payload_index);
3997 if (extra.data.body_len == 0) {
3998 // Function type or extern fn - no associated hash
3999 return null;
4000 }
4001 const bits = extra.data.bits;
4002 var extra_index = extra.end;
4003 extra_index += @intFromBool(bits.has_lib_name);
4004 if (bits.has_align_body) {
4005 const body_len = zir.extra[extra_index];
4006 extra_index += 1 + body_len;
4007 } else extra_index += @intFromBool(bits.has_align_ref);
4008 if (bits.has_addrspace_body) {
4009 const body_len = zir.extra[extra_index];
4010 extra_index += 1 + body_len;
4011 } else extra_index += @intFromBool(bits.has_addrspace_ref);
4012 if (bits.has_section_body) {
4013 const body_len = zir.extra[extra_index];
4014 extra_index += 1 + body_len;
4015 } else extra_index += @intFromBool(bits.has_section_ref);
4016 if (bits.has_cc_body) {
4017 const body_len = zir.extra[extra_index];
4018 extra_index += 1 + body_len;
4019 } else extra_index += @intFromBool(bits.has_cc_ref);
4020 if (bits.has_ret_ty_body) {
4021 const body_len = zir.extra[extra_index];
4022 extra_index += 1 + body_len;
4023 } else extra_index += @intFromBool(bits.has_ret_ty_ref);
4024 extra_index += @intFromBool(bits.has_any_noalias);
4025 extra_index += extra.data.body_len;
4026 extra_index += @typeInfo(Zir.Inst.Func.SrcLocs).Struct.fields.len;
4027 return @bitCast([4]u32{
4028 zir.extra[extra_index + 0],
4029 zir.extra[extra_index + 1],
4030 zir.extra[extra_index + 2],
4031 zir.extra[extra_index + 3],
4032 });
4033 },
4034 .extended => {},
4035 else => return null,
4036 }
4037 const extended = data[@intFromEnum(inst)].extended;
4038 switch (extended.opcode) {
4039 .struct_decl => {
4040 const extra = zir.extraData(Inst.StructDecl, extended.operand).data;
4041 return @bitCast([4]u32{
4042 extra.fields_hash_0,
4043 extra.fields_hash_1,
4044 extra.fields_hash_2,
4045 extra.fields_hash_3,
4046 });
4047 },
4048 .union_decl => {
4049 const extra = zir.extraData(Inst.UnionDecl, extended.operand).data;
4050 return @bitCast([4]u32{
4051 extra.fields_hash_0,
4052 extra.fields_hash_1,
4053 extra.fields_hash_2,
4054 extra.fields_hash_3,
4055 });
4056 },
4057 .enum_decl => {
4058 const extra = zir.extraData(Inst.EnumDecl, extended.operand).data;
4059 return @bitCast([4]u32{
4060 extra.fields_hash_0,
4061 extra.fields_hash_1,
4062 extra.fields_hash_2,
4063 extra.fields_hash_3,
4064 });
4065 },
4066 else => return null,
4067 }
4068}
src/print_zir.zig+34-3
......@@ -1401,7 +1401,17 @@ const Writer = struct {
14011401 fn writeStructDecl(self: *Writer, stream: anytype, extended: Zir.Inst.Extended.InstData) !void {
14021402 const small = @as(Zir.Inst.StructDecl.Small, @bitCast(extended.small));
14031403
1404 var extra_index: usize = extended.operand;
1404 const extra = self.code.extraData(Zir.Inst.StructDecl, extended.operand);
1405 const fields_hash: std.zig.SrcHash = @bitCast([4]u32{
1406 extra.data.fields_hash_0,
1407 extra.data.fields_hash_1,
1408 extra.data.fields_hash_2,
1409 extra.data.fields_hash_3,
1410 });
1411
1412 try stream.print("hash({}) ", .{std.fmt.fmtSliceHexLower(&fields_hash)});
1413
1414 var extra_index: usize = extra.end;
14051415
14061416 const src_node: ?i32 = if (small.has_src_node) blk: {
14071417 const src_node = @as(i32, @bitCast(self.code.extra[extra_index]));
......@@ -1591,7 +1601,17 @@ const Writer = struct {
15911601 fn writeUnionDecl(self: *Writer, stream: anytype, extended: Zir.Inst.Extended.InstData) !void {
15921602 const small = @as(Zir.Inst.UnionDecl.Small, @bitCast(extended.small));
15931603
1594 var extra_index: usize = extended.operand;
1604 const extra = self.code.extraData(Zir.Inst.UnionDecl, extended.operand);
1605 const fields_hash: std.zig.SrcHash = @bitCast([4]u32{
1606 extra.data.fields_hash_0,
1607 extra.data.fields_hash_1,
1608 extra.data.fields_hash_2,
1609 extra.data.fields_hash_3,
1610 });
1611
1612 try stream.print("hash({}) ", .{std.fmt.fmtSliceHexLower(&fields_hash)});
1613
1614 var extra_index: usize = extra.end;
15951615
15961616 const src_node: ?i32 = if (small.has_src_node) blk: {
15971617 const src_node = @as(i32, @bitCast(self.code.extra[extra_index]));
......@@ -1733,7 +1753,18 @@ const Writer = struct {
17331753
17341754 fn writeEnumDecl(self: *Writer, stream: anytype, extended: Zir.Inst.Extended.InstData) !void {
17351755 const small = @as(Zir.Inst.EnumDecl.Small, @bitCast(extended.small));
1736 var extra_index: usize = extended.operand;
1756
1757 const extra = self.code.extraData(Zir.Inst.EnumDecl, extended.operand);
1758 const fields_hash: std.zig.SrcHash = @bitCast([4]u32{
1759 extra.data.fields_hash_0,
1760 extra.data.fields_hash_1,
1761 extra.data.fields_hash_2,
1762 extra.data.fields_hash_3,
1763 });
1764
1765 try stream.print("hash({}) ", .{std.fmt.fmtSliceHexLower(&fields_hash)});
1766
1767 var extra_index: usize = extra.end;
17371768
17381769 const src_node: ?i32 = if (small.has_src_node) blk: {
17391770 const src_node = @as(i32, @bitCast(self.code.extra[extra_index]));