authorgravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2022-08-05 15:29:59+03:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2022-08-05 15:29:59+03:00
log42ade6a11443d50bec1131283899e1a9d77c01d6
treea6c7dee0b50a9a05c338e17002e9c0ba66486dcc
parent259f407160f84a1bf33c1aa7bd10318213f52ddf
parentab3b614a335ffac9eac4f824ee18fba262ad988e
signaturebadge-question-mark Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #12300 from antlilja/getParamName

Replace param_names and anytype_args fields inside of Fn with functions

9 files changed, 64 insertions(+), 43 deletions(-)

src/Module.zig+35-22
......@@ -1464,20 +1464,8 @@ pub const Fn = struct {
14641464 /// These never have .generic_poison for the Type
14651465 /// because the Type is needed to pass to `Type.eql` and for inserting comptime arguments
14661466 /// into the inst_map when analyzing the body of a generic function instantiation.
1467 /// Instead, the is_anytype knowledge is communicated via `anytype_args`.
1467 /// Instead, the is_anytype knowledge is communicated via `isAnytypeParam`.
14681468 comptime_args: ?[*]TypedValue,
1469 /// When comptime_args is null, this is undefined. Otherwise, this flags each
1470 /// parameter and tells whether it is anytype.
1471 /// TODO apply the same enhancement for param_names below to this field.
1472 anytype_args: [*]bool,
1473
1474 /// Prefer to use `getParamName` to access this because of the future improvement
1475 /// we want to do mentioned in the TODO below.
1476 /// Stored in gpa.
1477 /// TODO: change param ZIR instructions to be embedded inside the function
1478 /// ZIR instruction instead of before it, so that `zir_body_inst` can be used to
1479 /// determine param names rather than redundantly storing them here.
1480 param_names: []const [:0]const u8,
14811469
14821470 /// Precomputed hash for monomorphed_funcs.
14831471 /// This is important because it may be accessed when resizing monomorphed_funcs
......@@ -1590,18 +1578,43 @@ pub const Fn = struct {
15901578 gpa.destroy(node);
15911579 it = next;
15921580 }
1581 }
15931582
1594 for (func.param_names) |param_name| {
1595 gpa.free(param_name);
1596 }
1597 gpa.free(func.param_names);
1583 pub fn isAnytypeParam(func: Fn, mod: *Module, index: u32) bool {
1584 const file = mod.declPtr(func.owner_decl).getFileScope();
1585
1586 const tags = file.zir.instructions.items(.tag);
1587
1588 const param_body = file.zir.getParamBody(func.zir_body_inst);
1589 const param = param_body[index];
1590
1591 return switch (tags[param]) {
1592 .param, .param_comptime => false,
1593 .param_anytype, .param_anytype_comptime => true,
1594 else => unreachable,
1595 };
15981596 }
15991597
1600 pub fn getParamName(func: Fn, index: u32) [:0]const u8 {
1601 // TODO rework ZIR of parameters so that this function looks up
1602 // param names in ZIR instead of redundantly saving them into Fn.
1603 // const zir = func.owner_decl.getFileScope().zir;
1604 return func.param_names[index];
1598 pub fn getParamName(func: Fn, mod: *Module, index: u32) [:0]const u8 {
1599 const file = mod.declPtr(func.owner_decl).getFileScope();
1600
1601 const tags = file.zir.instructions.items(.tag);
1602 const data = file.zir.instructions.items(.data);
1603
1604 const param_body = file.zir.getParamBody(func.zir_body_inst);
1605 const param = param_body[index];
1606
1607 return switch (tags[param]) {
1608 .param, .param_comptime => blk: {
1609 const extra = file.zir.extraData(Zir.Inst.Param, data[param].pl_tok.payload_index);
1610 break :blk file.zir.nullTerminatedString(extra.data.name);
1611 },
1612 .param_anytype, .param_anytype_comptime => blk: {
1613 const param_data = data[param].str_tok;
1614 break :blk param_data.get(file.zir);
1615 },
1616 else => unreachable,
1617 };
16051618 }
16061619
16071620 pub fn hasInferredErrorSet(func: Fn, mod: *Module) bool {
src/Sema.zig+2-15
......@@ -5506,7 +5506,7 @@ const GenericCallAdapter = struct {
55065506 const this_is_comptime = this_arg.val.tag() != .generic_poison;
55075507 const other_is_comptime = other_arg.val.tag() != .generic_poison;
55085508 const this_is_anytype = this_arg.ty.tag() != .generic_poison;
5509 const other_is_anytype = other_key.anytype_args[i];
5509 const other_is_anytype = other_key.isAnytypeParam(ctx.module, @intCast(u32, i));
55105510
55115511 if (other_is_anytype != this_is_anytype) return false;
55125512 if (other_is_comptime != this_is_comptime) return false;
......@@ -6386,12 +6386,9 @@ fn instantiateGenericCall(
63866386 errdefer new_func.deinit(gpa);
63876387 assert(new_func == new_module_func);
63886388
6389 const anytype_args = try new_decl_arena_allocator.alloc(bool, func_ty_info.param_types.len);
6390 new_func.anytype_args = anytype_args.ptr;
63916389 arg_i = 0;
63926390 for (fn_info.param_body) |inst| {
63936391 var is_comptime = false;
6394 var is_anytype = false;
63956392 switch (zir_tags[inst]) {
63966393 .param => {
63976394 is_comptime = func_ty_info.paramIsComptime(arg_i);
......@@ -6400,11 +6397,9 @@ fn instantiateGenericCall(
64006397 is_comptime = true;
64016398 },
64026399 .param_anytype => {
6403 is_anytype = true;
64046400 is_comptime = func_ty_info.paramIsComptime(arg_i);
64056401 },
64066402 .param_anytype_comptime => {
6407 is_anytype = true;
64086403 is_comptime = true;
64096404 },
64106405 else => continue,
......@@ -6412,10 +6407,9 @@ fn instantiateGenericCall(
64126407
64136408 // We populate the Type here regardless because it is needed by
64146409 // `GenericCallAdapter.eql` as well as function body analysis.
6415 // Whether it is anytype is communicated by `anytype_args`.
6410 // Whether it is anytype is communicated by `isAnytypeParam`.
64166411 const arg = child_sema.inst_map.get(inst).?;
64176412 const copied_arg_ty = try child_sema.typeOf(arg).copy(new_decl_arena_allocator);
6418 anytype_args[arg_i] = is_anytype;
64196413
64206414 if (try sema.typeRequiresComptime(block, .unneeded, copied_arg_ty)) {
64216415 is_comptime = true;
......@@ -7760,11 +7754,6 @@ fn funcCommon(
77607754 break :blk if (sema.comptime_args.len == 0) null else sema.comptime_args.ptr;
77617755 } else null;
77627756
7763 const param_names = try sema.gpa.alloc([:0]const u8, block.params.items.len);
7764 for (param_names) |*param_name, i| {
7765 param_name.* = try sema.gpa.dupeZ(u8, block.params.items[i].name);
7766 }
7767
77687757 const hash = new_func.hash;
77697758 const fn_payload = try sema.arena.create(Value.Payload.Function);
77707759 new_func.* = .{
......@@ -7772,13 +7761,11 @@ fn funcCommon(
77727761 .zir_body_inst = func_inst,
77737762 .owner_decl = sema.owner_decl_index,
77747763 .comptime_args = comptime_args,
7775 .anytype_args = undefined,
77767764 .hash = hash,
77777765 .lbrace_line = src_locs.lbrace_line,
77787766 .rbrace_line = src_locs.rbrace_line,
77797767 .lbrace_column = @truncate(u16, src_locs.columns),
77807768 .rbrace_column = @truncate(u16, src_locs.columns >> 16),
7781 .param_names = param_names,
77827769 .branch_quota = default_branch_quota,
77837770 .is_noinline = is_noinline,
77847771 };
src/Zir.zig+21
......@@ -3915,6 +3915,27 @@ pub const FnInfo = struct {
39153915 total_params_len: u32,
39163916};
39173917
3918pub fn getParamBody(zir: Zir, fn_inst: Inst.Index) []const u32 {
3919 const tags = zir.instructions.items(.tag);
3920 const datas = zir.instructions.items(.data);
3921 const inst_data = datas[fn_inst].pl_node;
3922
3923 const param_block_index = switch (tags[fn_inst]) {
3924 .func, .func_inferred => blk: {
3925 const extra = zir.extraData(Inst.Func, inst_data.payload_index);
3926 break :blk extra.data.param_block;
3927 },
3928 .func_fancy => blk: {
3929 const extra = zir.extraData(Inst.FuncFancy, inst_data.payload_index);
3930 break :blk extra.data.param_block;
3931 },
3932 else => unreachable,
3933 };
3934
3935 const param_block = zir.extraData(Inst.Block, datas[param_block_index].pl_node.payload_index);
3936 return zir.extra[param_block.end..][0..param_block.data.body_len];
3937}
3938
39183939pub fn getFnInfo(zir: Zir, fn_inst: Inst.Index) FnInfo {
39193940 const tags = zir.instructions.items(.tag);
39203941 const datas = zir.instructions.items(.data);
src/arch/arm/CodeGen.zig+1-1
......@@ -3372,7 +3372,7 @@ fn genArgDbgInfo(self: *Self, inst: Air.Inst.Index, arg_index: u32, stack_byte_c
33723372
33733373 const mcv = self.args[arg_index];
33743374 const ty = self.air.instructions.items(.data)[inst].ty;
3375 const name = self.mod_fn.getParamName(arg_index);
3375 const name = self.mod_fn.getParamName(self.bin_file.options.module.?, arg_index);
33763376 const name_with_null = name.ptr[0 .. name.len + 1];
33773377
33783378 switch (mcv) {
src/arch/riscv64/CodeGen.zig+1-1
......@@ -1619,7 +1619,7 @@ fn airFieldParentPtr(self: *Self, inst: Air.Inst.Index) !void {
16191619
16201620fn genArgDbgInfo(self: *Self, inst: Air.Inst.Index, mcv: MCValue, arg_index: u32) !void {
16211621 const ty = self.air.instructions.items(.data)[inst].ty;
1622 const name = self.mod_fn.getParamName(arg_index);
1622 const name = self.mod_fn.getParamName(self.bin_file.options.module.?, arg_index);
16231623 const name_with_null = name.ptr[0 .. name.len + 1];
16241624
16251625 switch (mcv) {
src/arch/sparc64/CodeGen.zig+1-1
......@@ -2959,7 +2959,7 @@ fn finishAir(self: *Self, inst: Air.Inst.Index, result: MCValue, operands: [Live
29592959
29602960fn genArgDbgInfo(self: *Self, inst: Air.Inst.Index, mcv: MCValue, arg_index: u32) !void {
29612961 const ty = self.air.instructions.items(.data)[inst].ty;
2962 const name = self.mod_fn.getParamName(arg_index);
2962 const name = self.mod_fn.getParamName(self.bin_file.options.module.?, arg_index);
29632963 const name_with_null = name.ptr[0 .. name.len + 1];
29642964
29652965 switch (mcv) {
src/arch/wasm/CodeGen.zig+1-1
......@@ -1991,7 +1991,7 @@ fn airArg(self: *Self, inst: Air.Inst.Index) InnerError!WValue {
19911991 switch (self.debug_output) {
19921992 .dwarf => |dwarf| {
19931993 // TODO: Get the original arg index rather than wasm arg index
1994 const name = self.mod_fn.getParamName(arg_index);
1994 const name = self.mod_fn.getParamName(self.bin_file.base.options.module.?, arg_index);
19951995 const leb_size = link.File.Wasm.getULEB128Size(arg.local);
19961996 const dbg_info = &dwarf.dbg_info;
19971997 try dbg_info.ensureUnusedCapacity(3 + leb_size + 5 + name.len + 1);
src/arch/x86_64/CodeGen.zig+1-1
......@@ -3789,7 +3789,7 @@ fn airArg(self: *Self, inst: Air.Inst.Index) !void {
37893789
37903790 const ty = self.air.typeOfIndex(inst);
37913791 const mcv = self.args[arg_index];
3792 const name = self.mod_fn.getParamName(arg_index);
3792 const name = self.mod_fn.getParamName(self.bin_file.options.module.?, arg_index);
37933793 const name_with_null = name.ptr[0 .. name.len + 1];
37943794
37953795 if (self.liveness.isUnused(inst))
src/codegen/llvm.zig+1-1
......@@ -7313,7 +7313,7 @@ pub const FuncGen = struct {
73137313 const lbrace_col = func.lbrace_column + 1;
73147314 const di_local_var = dib.createParameterVariable(
73157315 self.di_scope.?,
7316 func.getParamName(src_index).ptr, // TODO test 0 bit args
7316 func.getParamName(self.dg.module, src_index).ptr, // TODO test 0 bit args
73177317 self.di_file.?,
73187318 lbrace_line,
73197319 try self.dg.object.lowerDebugType(inst_ty, .full),