diff --git a/src/Sema.zig b/src/Sema.zig index 16bf87241924068cc0f3f7f14ce00f198558fcea..4475cfc008380fcd8ca4abd93b9c23fe223de067 100644 --- a/src/Sema.zig +++ b/src/Sema.zig @@ -36506,7 +36506,7 @@ pub fn typeRequiresComptime(sema: *Sema, ty: Type) CompileError!bool { .ptr_type => |ptr_type| { const child_ty = ptr_type.child.toType(); switch (child_ty.zigTypeTag(mod)) { - .Fn => return mod.typeToFunc(child_ty).?.is_generic, + .Fn => return !try sema.fnHasRuntimeBits(child_ty), .Opaque => return false, else => return sema.typeRequiresComptime(child_ty), } diff --git a/src/type.zig b/src/type.zig index 67f855806fb82c02c5261826f0a1db9601c4e8d6..32d207bfbf68b9ede3535aedce18b1ce1d6596d4 100644 --- a/src/type.zig +++ b/src/type.zig @@ -467,12 +467,10 @@ pub const Type = struct { .empty_struct_type => false, else => switch (ip.indexToKey(ty.toIntern())) { .int_type => |int_type| int_type.bits != 0, - .ptr_type => |ptr_type| { + .ptr_type => { // Pointers to zero-bit types still have a runtime address; however, pointers // to comptime-only types do not, with the exception of function pointers. if (ignore_comptime_only) return true; - const child_ty = ptr_type.child.toType(); - if (child_ty.zigTypeTag(mod) == .Fn) return !mod.typeToFunc(child_ty).?.is_generic; if (strat == .sema) return !(try strat.sema.typeRequiresComptime(ty)); return !comptimeOnly(ty, mod); }, @@ -2649,7 +2647,7 @@ pub const Type = struct { .ptr_type => |ptr_type| { const child_ty = ptr_type.child.toType(); switch (child_ty.zigTypeTag(mod)) { - .Fn => return mod.typeToFunc(child_ty).?.is_generic, + .Fn => return !child_ty.isFnOrHasRuntimeBits(mod), .Opaque => return false, else => return child_ty.comptimeOnly(mod), } diff --git a/test/behavior/call.zig b/test/behavior/call.zig index d641d5d5ba7664f641ade775b5ceacf3b6ecb5a8..6be66da1746cab0b47e936559ab18a2189eebe03 100644 --- a/test/behavior/call.zig +++ b/test/behavior/call.zig @@ -491,3 +491,13 @@ test "argument to generic function has correct result type" { try S.doTheTest(); try comptime S.doTheTest(); } + +test "call inline fn through pointer" { + const S = struct { + inline fn foo(x: u8) !void { + try expect(x == 123); + } + }; + const f = &S.foo; + try f(123); +}