mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-05 21:13:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

stage2: ignore generic return type when hashing function type

Browse Source 
Generic parameter types are already ignored.
This commit is contained in:
Veikka Tuominen 2022-05-31 16:43:58 +03:00
parent febc7d3cd6
commit 36df79cd37
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/type.zig
View File

@ -1036,7 +1036,9 @@ pub const Type = extern union {
std.hash.autoHash(hasher, std.builtin.TypeId.Fn);
const fn_info = ty.fnInfo();
hashWithHasher(fn_info.return_type, hasher, mod);
if (fn_info.return_type.tag() != .generic_poison) {
hashWithHasher(fn_info.return_type, hasher, mod);
}
std.hash.autoHash(hasher, fn_info.alignment);
std.hash.autoHash(hasher, fn_info.cc);
std.hash.autoHash(hasher, fn_info.is_var_args);

18
test/behavior/basic.zig
View File

@ -987,3 +987,21 @@ test "array type comes from generic function" {
const args = [_]S.A(){.{}};
_ = args;
}
test "generic function uses return type of other generic function" {
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
const S = struct {
fn call(
f: anytype,
args: anytype,
) @TypeOf(@call(.{}, f, @as(@TypeOf(args), undefined))) {
return @call(.{}, f, args);
}
fn func(arg: anytype) @TypeOf(arg) {
return arg;
}
};
try std.testing.expect(S.call(S.func, .{@as(u8, 1)}) == 1);
}