authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-07-09 15:31:47-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-07-18 19:02:05-07:00
logc193872c814ab2c9fefcc884782301157ba8c29e
treef2a5995565f82cb42436751aff6d04707d569f5a
parent4a55fc6c53b27ed9be0bd316969fbdfbef98ad1f

InternPool: implement indexToKey for func_instance and func_decl

Also delete incorrect frees an arena-allocated parameters.

3 files changed, 64 insertions(+), 26 deletions(-)

src/InternPool.zig+61-14
......@@ -3178,8 +3178,8 @@ pub fn indexToKey(ip: *const InternPool, index: Index) Key {
31783178 } };
31793179 },
31803180 .extern_func => .{ .extern_func = ip.extraData(Tag.ExternFunc, data) },
3181 .func_instance => .{ .func = ip.indexToKeyFuncInstance(data) },
3182 .func_decl => .{ .func = ip.extraIndexToFuncDecl(data) },
3181 .func_instance => .{ .func = ip.extraFuncInstance(data) },
3182 .func_decl => .{ .func = ip.extraFuncDecl(data) },
31833183 .only_possible_value => {
31843184 const ty = @as(Index, @enumFromInt(data));
31853185 const ty_item = ip.items.get(@intFromEnum(ty));
......@@ -3328,16 +3328,48 @@ fn extraFuncType(ip: *const InternPool, extra_index: u32) Key.FuncType {
33283328 };
33293329}
33303330
3331fn extraIndexToFuncDecl(ip: *const InternPool, extra_index: u32) Key.Func {
3332 _ = ip;
3333 _ = extra_index;
3334 @panic("TODO");
3331fn extraFuncDecl(ip: *const InternPool, extra_index: u32) Key.Func {
3332 const P = Tag.FuncDecl;
3333 const func_decl = ip.extraDataTrail(P, extra_index);
3334 return .{
3335 .ty = func_decl.data.ty,
3336 .analysis_extra_index = extra_index + std.meta.fieldIndex(P, "analysis").?,
3337 .zir_body_inst_extra_index = extra_index + std.meta.fieldIndex(P, "zir_body_inst").?,
3338 .resolved_error_set_extra_index = if (func_decl.data.analysis.inferred_error_set) func_decl.end else 0,
3339 .branch_quota_extra_index = 0,
3340 .owner_decl = func_decl.data.owner_decl,
3341 .zir_body_inst = func_decl.data.zir_body_inst,
3342 .lbrace_line = func_decl.data.lbrace_line,
3343 .rbrace_line = func_decl.data.rbrace_line,
3344 .lbrace_column = func_decl.data.lbrace_column,
3345 .rbrace_column = func_decl.data.lbrace_column,
3346 .generic_owner = .none,
3347 .comptime_args = .{ .start = 0, .len = 0 },
3348 };
33353349}
33363350
3337fn indexToKeyFuncInstance(ip: *const InternPool, data: u32) Key.Func {
3338 _ = ip;
3339 _ = data;
3340 @panic("TODO");
3351fn extraFuncInstance(ip: *const InternPool, extra_index: u32) Key.Func {
3352 const P = Tag.FuncInstance;
3353 const fi = ip.extraDataTrail(P, extra_index);
3354 const func_decl = ip.funcDeclInfo(fi.data.generic_owner);
3355 return .{
3356 .ty = fi.data.ty,
3357 .analysis_extra_index = extra_index + std.meta.fieldIndex(P, "analysis").?,
3358 .zir_body_inst_extra_index = func_decl.zir_body_inst_extra_index,
3359 .resolved_error_set_extra_index = if (fi.data.analysis.inferred_error_set) fi.end else 0,
3360 .branch_quota_extra_index = extra_index + std.meta.fieldIndex(P, "branch_quota").?,
3361 .owner_decl = fi.data.owner_decl,
3362 .zir_body_inst = func_decl.zir_body_inst,
3363 .lbrace_line = func_decl.lbrace_line,
3364 .rbrace_line = func_decl.rbrace_line,
3365 .lbrace_column = func_decl.lbrace_column,
3366 .rbrace_column = func_decl.lbrace_column,
3367 .generic_owner = fi.data.generic_owner,
3368 .comptime_args = .{
3369 .start = fi.end + @intFromBool(fi.data.analysis.inferred_error_set),
3370 .len = ip.funcTypeParamsLen(func_decl.ty),
3371 },
3372 };
33413373}
33423374
33433375fn indexToKeyEnum(ip: *const InternPool, data: u32, tag_mode: Key.EnumType.TagMode) Key {
......@@ -4421,7 +4453,7 @@ pub fn getFuncDecl(ip: *InternPool, gpa: Allocator, key: GetFuncDeclKey) Allocat
44214453
44224454 const adapter: KeyAdapter = .{ .intern_pool = ip };
44234455 const gop = ip.map.getOrPutAssumeCapacityAdapted(Key{
4424 .func = extraIndexToFuncDecl(ip, func_decl_extra_index),
4456 .func = extraFuncDecl(ip, func_decl_extra_index),
44254457 }, adapter);
44264458
44274459 if (gop.found_existing) {
......@@ -4544,7 +4576,7 @@ pub fn getFuncDeclIes(ip: *InternPool, gpa: Allocator, key: GetFuncDeclIesKey) A
45444576
45454577 const adapter: KeyAdapter = .{ .intern_pool = ip };
45464578 const gop = ip.map.getOrPutAssumeCapacityAdapted(Key{
4547 .func = extraIndexToFuncDecl(ip, func_decl_extra_index),
4579 .func = extraFuncDecl(ip, func_decl_extra_index),
45484580 }, adapter);
45494581 if (!gop.found_existing) {
45504582 assert(!ip.map.getOrPutAssumeCapacityAdapted(Key{ .error_union_type = .{
......@@ -5052,7 +5084,7 @@ fn addLimbsAssumeCapacity(ip: *InternPool, limbs: []const Limb) void {
50525084 }
50535085}
50545086
5055fn extraDataTrail(ip: *const InternPool, comptime T: type, index: usize) struct { data: T, end: usize } {
5087fn extraDataTrail(ip: *const InternPool, comptime T: type, index: usize) struct { data: T, end: u32 } {
50565088 var result: T = undefined;
50575089 const fields = @typeInfo(T).Struct.fields;
50585090 inline for (fields, 0..) |field, i| {
......@@ -5085,7 +5117,7 @@ fn extraDataTrail(ip: *const InternPool, comptime T: type, index: usize) struct
50855117 }
50865118 return .{
50875119 .data = result,
5088 .end = index + fields.len,
5120 .end = @intCast(index + fields.len),
50895121 };
50905122}
50915123
......@@ -6713,3 +6745,18 @@ pub fn funcIesResolved(ip: *const InternPool, func_index: InternPool.Index) *Int
67136745 };
67146746 return @ptrCast(&ip.extra.items[extra_index]);
67156747}
6748
6749pub fn funcDeclInfo(ip: *const InternPool, i: InternPool.Index) Key.Func {
6750 const tags = ip.items.items(.tag);
6751 const datas = ip.items.items(.data);
6752 assert(tags[@intFromEnum(i)] == .func_decl);
6753 return extraFuncDecl(ip, datas[@intFromEnum(i)]);
6754}
6755
6756pub fn funcTypeParamsLen(ip: *const InternPool, i: InternPool.Index) u32 {
6757 const tags = ip.items.items(.tag);
6758 const datas = ip.items.items(.data);
6759 assert(tags[@intFromEnum(i)] == .type_function);
6760 const start = datas[@intFromEnum(i)];
6761 return ip.extra.items[start + std.meta.fieldIndex(Tag.TypeFunction, "params_len").?];
6762}
src/Module.zig+1-4
......@@ -4279,10 +4279,7 @@ fn semaDecl(mod: *Module, decl_index: Decl.Index) !bool {
42794279 .inlining = null,
42804280 .is_comptime = true,
42814281 };
4282 defer {
4283 block_scope.instructions.deinit(gpa);
4284 block_scope.params.deinit(gpa);
4285 }
4282 defer block_scope.instructions.deinit(gpa);
42864283
42874284 const zir_block_index = decl.zirBlockIndex(mod);
42884285 const inst_data = zir_datas[zir_block_index].pl_node;
src/Sema.zig+2-8
......@@ -34063,10 +34063,7 @@ fn semaStructFields(mod: *Module, struct_obj: *Module.Struct) CompileError!void
3406334063 .inlining = null,
3406434064 .is_comptime = true,
3406534065 };
34066 defer {
34067 assert(block_scope.instructions.items.len == 0);
34068 block_scope.params.deinit(gpa);
34069 }
34066 defer assert(block_scope.instructions.items.len == 0);
3407034067
3407134068 struct_obj.fields = .{};
3407234069 try struct_obj.fields.ensureTotalCapacity(mod.tmp_hack_arena.allocator(), fields_len);
......@@ -34409,10 +34406,7 @@ fn semaUnionFields(mod: *Module, union_obj: *Module.Union) CompileError!void {
3440934406 .inlining = null,
3441034407 .is_comptime = true,
3441134408 };
34412 defer {
34413 assert(block_scope.instructions.items.len == 0);
34414 block_scope.params.deinit(gpa);
34415 }
34409 defer assert(block_scope.instructions.items.len == 0);
3441634410
3441734411 if (body.len != 0) {
3441834412 try sema.analyzeBody(&block_scope, body);