sema: instead of saving the init bodies ranges in the InternPool, rebuild them at analysis time

Author: kcbanner

src/AstGen.zig

@@ -4954,7 +4954,7 @@ fn structDeclInner(
 
             // The decl_inst is used as here so that we can easily reconstruct a mapping
             // between it and the field type when the fields inits are analzyed.
-            const ri: ResultInfo = .{ .rl = if (field_type == .none) .none else .{ .coerced_ty = Zir.indexToRef(decl_inst) } };
+            const ri: ResultInfo = .{ .rl = if (field_type == .none) .none else .{ .coerced_ty = decl_inst.toRef() } };
 
             const default_inst = try expr(&block_scope, &namespace.base, ri, member.ast.value_expr);
             if (!block_scope.endsWithNoReturn()) {

src/Autodoc.zig

@@ -3708,8 +3708,8 @@ fn walkInstruction(
 
                     // Inside field init bodies, the struct decl instruction is used to refer to the
                     // field type during the second pass of analysis.
-                    try self.repurposed_insts.put(self.arena, @intCast(inst_index), {});
-                    defer _ = self.repurposed_insts.remove(@intCast(inst_index));
+                    try self.repurposed_insts.put(self.arena, inst, {});
+                    defer _ = self.repurposed_insts.remove(inst);
 
                     var field_type_refs: std.ArrayListUnmanaged(DocData.Expr) = .{};
                     var field_default_refs: std.ArrayListUnmanaged(?DocData.Expr) = .{};

src/InternPool.zig

@@ -370,7 +370,6 @@ pub const Key = union(enum) {
         layout: std.builtin.Type.ContainerLayout,
         field_names: NullTerminatedString.Slice,
         field_types: Index.Slice,
-        field_inits_bodies: InitBody.Slice,
         field_inits: Index.Slice,
         field_aligns: Alignment.Slice,
         runtime_order: RuntimeOrder.Slice,
@@ -401,23 +400,6 @@ pub const Key = union(enum) {
             }
         };
 
-        pub const InitBody = struct {
-            start: Zir.Inst.Index,
-            len: u32,
-
-            pub const Slice = struct {
-                start: u32,
-                len: u32,
-
-                pub fn get(this: @This(), ip: *const InternPool) []InitBody {
-                    // Workaround for not being able to cast between slices of different lengths
-                    assert(ip.extra.items.len >= this.start + this.len * 2);
-                    const bodies_ptr: [*]InitBody = @ptrCast(ip.extra.items[this.start..].ptr);
-                    return bodies_ptr[0..this.len];
-                }
-            };
-        };
-
         pub const Offsets = struct {
             start: u32,
             len: u32,
@@ -3057,10 +3039,7 @@ pub const Tag = enum(u8) {
     /// Trailing:
     /// 0. type: Index for each fields_len
     /// 1. name: NullTerminatedString for each fields_len
-    ///
-    /// if tag is type_struct_packed_inits:
-    /// 2. body_indices: Zir.Inst.Index // for each field in declared order, a pair of start index and length.
-    /// 3. init: Index for each fields_len
+    /// 2. init: Index for each fields_len // if tag is type_struct_packed_inits
     pub const TypeStructPacked = struct {
         decl: Module.Decl.Index,
         zir_index: Zir.Inst.Index,
@@ -3098,7 +3077,6 @@ pub const Tag = enum(u8) {
     ///    names_map: MapIndex,
     ///    name: NullTerminatedString // for each field in declared order
     /// 2. if any_default_inits:
-    ///    body_indices: Zir.Inst.Index // for each field in declared order, a pair of start index and length.
     ///    init: Index // for each field in declared order
     /// 3. if has_namespace:
     ///    namespace: Module.Namespace.Index
@@ -3779,7 +3757,6 @@ pub fn indexToKey(ip: *const InternPool, index: Index) Key {
             .layout = .Auto,
             .field_names = .{ .start = 0, .len = 0 },
             .field_types = .{ .start = 0, .len = 0 },
-            .field_inits_bodies = .{ .start = 0, .len = 0 },
             .field_inits = .{ .start = 0, .len = 0 },
             .field_aligns = .{ .start = 0, .len = 0 },
             .runtime_order = .{ .start = 0, .len = 0 },
@@ -3796,7 +3773,6 @@ pub fn indexToKey(ip: *const InternPool, index: Index) Key {
             .layout = .Auto,
             .field_names = .{ .start = 0, .len = 0 },
             .field_types = .{ .start = 0, .len = 0 },
-            .field_inits_bodies = .{ .start = 0, .len = 0 },
             .field_inits = .{ .start = 0, .len = 0 },
             .field_aligns = .{ .start = 0, .len = 0 },
             .runtime_order = .{ .start = 0, .len = 0 },
@@ -4309,12 +4285,6 @@ fn extraStructType(ip: *const InternPool, extra_index: u32) Key.StructType {
         index += fields_len;
         break :t .{ names_map.toOptional(), names };
     };
-    const field_inits_bodies: Key.StructType.InitBody.Slice = t: {
-        if (!s.data.flags.any_default_inits) break :t .{ .start = 0, .len = 0 };
-        const offsets: Key.StructType.InitBody.Slice = .{ .start = index, .len = fields_len };
-        index += fields_len * 2;
-        break :t offsets;
-    };
     const field_inits: Index.Slice = t: {
         if (!s.data.flags.any_default_inits) break :t .{ .start = 0, .len = 0 };
         const inits: Index.Slice = .{ .start = index, .len = fields_len };
@@ -4358,7 +4328,6 @@ fn extraStructType(ip: *const InternPool, extra_index: u32) Key.StructType {
         .field_types = field_types,
         .names_map = names_map,
         .field_names = field_names,
-        .field_inits_bodies = field_inits_bodies,
         .field_inits = field_inits,
         .namespace = namespace,
         .field_aligns = field_aligns,
@@ -4385,15 +4354,8 @@ fn extraPackedStructType(ip: *const InternPool, extra_index: u32, inits: bool) K
             .start = type_struct_packed.end + fields_len,
             .len = fields_len,
         },
-        .field_inits_bodies = if (inits) .{
-            .start = type_struct_packed.end + fields_len * 2,
-            .len = fields_len,
-        } else .{
-            .start = 0,
-            .len = 0,
-        },
         .field_inits = if (inits) .{
-            .start = type_struct_packed.end + fields_len * 4,
+            .start = type_struct_packed.end + fields_len * 2,
             .len = fields_len,
         } else .{
             .start = 0,
@@ -5466,7 +5428,6 @@ pub fn getStructType(
             .layout = undefined,
             .field_names = undefined,
             .field_types = undefined,
-            .field_inits_bodies = undefined,
             .field_inits = undefined,
             .field_aligns = undefined,
             .runtime_order = undefined,
@@ -5489,7 +5450,6 @@ pub fn getStructType(
             try ip.extra.ensureUnusedCapacity(gpa, @typeInfo(Tag.TypeStructPacked).Struct.fields.len +
                 ini.fields_len + // types
                 ini.fields_len + // names
-                ini.fields_len * 2 + // init bodies
                 ini.fields_len); // inits
             try ip.items.append(gpa, .{
                 .tag = if (ini.any_default_inits) .type_struct_packed_inits else .type_struct_packed,
@@ -5509,7 +5469,6 @@ pub fn getStructType(
             ip.extra.appendNTimesAssumeCapacity(@intFromEnum(Index.none), ini.fields_len);
             ip.extra.appendNTimesAssumeCapacity(@intFromEnum(OptionalNullTerminatedString.none), ini.fields_len);
             if (ini.any_default_inits) {
-                ip.extra.appendNTimesAssumeCapacity(0, ini.fields_len * 2);
                 ip.extra.appendNTimesAssumeCapacity(@intFromEnum(Index.none), ini.fields_len);
             }
             return @enumFromInt(ip.items.len - 1);
@@ -5521,7 +5480,7 @@ pub fn getStructType(
     const comptime_elements_len = if (ini.any_comptime_fields) (ini.fields_len + 31) / 32 else 0;
 
     try ip.extra.ensureUnusedCapacity(gpa, @typeInfo(Tag.TypeStruct).Struct.fields.len +
-        (ini.fields_len * 7) + // types, names, init bodies, inits, runtime order, offsets
+        (ini.fields_len * 5) + // types, names, inits, runtime order, offsets
         align_elements_len + comptime_elements_len +
         2); // names_map + namespace
     try ip.items.append(gpa, .{
@@ -5559,7 +5518,6 @@ pub fn getStructType(
         ip.extra.appendNTimesAssumeCapacity(@intFromEnum(OptionalNullTerminatedString.none), ini.fields_len);
     }
     if (ini.any_default_inits) {
-        ip.extra.appendNTimesAssumeCapacity(0, ini.fields_len * 2);
         ip.extra.appendNTimesAssumeCapacity(@intFromEnum(Index.none), ini.fields_len);
     }
     if (ini.namespace.unwrap()) |namespace| {