Commit ebde525ccee41a8eefbb868cf4df756f1a937dd2 | zig

author	Bogdan Romanyuk <wrongnull@gmail.com> 2023-10-16 04:30:39+03:00
committer	GitHub <noreply@github.com> 2023-10-16 01:30:39+00:00
log	ebde525ccee41a8eefbb868cf4df756f1a937dd2
tree	5cb5a1b6780edb493d23275d01ab958651c0a556
parent	fd6b3db34252f2a548630c0e57fe80f32202aa12
signature	Signed by PGP key 4AEE18F83AFDEB23

Sema: fix `@extern` error on function pointer

2 files changed, 21 insertions(+), 4 deletions(-)

src
- Sema.zig
test
- cases
  - compile_errors
    invalid_type_in_builtin_extern.zig

src/Sema.zig+14-4

 @@ -25277,7 +25277,7 @@ fn zirBuiltinExtern(
     if (!ty.isPtrAtRuntime(mod)) {
         return sema.fail(block, ty_src, "expected (optional) pointer", .{});
     }
-    if (!try sema.validateExternType(ty.childType(mod), .other)) {
+    if (!try sema.validateExternType(ty, .other)) {
         const msg = msg: {
             const msg = try sema.errMsg(block, ty_src, "extern symbol cannot have type '{}'", .{ty.fmt(mod)});
             errdefer msg.destroy(sema.gpa);
 @@ -25618,7 +25618,12 @@ fn validateExternType(
         .Float,
         .AnyFrame,
         => return true,
-        .Pointer => return !(ty.isSlice(mod) or try sema.typeRequiresComptime(ty)),
+        .Pointer => {
+            if (ty.childType(mod).zigTypeTag(mod) == .Fn) {
+                return ty.isConstPtr(mod) and try sema.validateExternType(ty.childType(mod), .other);
+            }
+            return !(ty.isSlice(mod) or try sema.typeRequiresComptime(ty));
+        },
         .Int => switch (ty.intInfo(mod).bits) {
             0, 8, 16, 32, 64, 128 => return true,
             else => return false,
 @@ -25687,8 +25692,13 @@ fn explainWhyTypeIsNotExtern(
                 try mod.errNoteNonLazy(src_loc, msg, "slices have no guaranteed in-memory representation", .{});
             } else {
                 const pointee_ty = ty.childType(mod);
-                try mod.errNoteNonLazy(src_loc, msg, "pointer to comptime-only type '{}'", .{pointee_ty.fmt(sema.mod)});
+                if (!ty.isConstPtr(mod) and pointee_ty.zigTypeTag(mod) == .Fn) {
-                try sema.explainWhyTypeIsComptime(msg, src_loc, pointee_ty);
+                    try mod.errNoteNonLazy(src_loc, msg, "pointer to extern function must be 'const'", .{});
+                } else if (try sema.typeRequiresComptime(ty)) {
+                    try mod.errNoteNonLazy(src_loc, msg, "pointer to comptime-only type '{}'", .{pointee_ty.fmt(sema.mod)});
+                    try sema.explainWhyTypeIsComptime(msg, src_loc, ty);
+                }
+                try sema.explainWhyTypeIsNotExtern(msg, src_loc, pointee_ty, position);
             }
         },
         .Void => try mod.errNoteNonLazy(src_loc, msg, "'void' is a zero bit type; for C 'void' use 'anyopaque'", .{}),

test/cases/compile_errors/invalid_type_in_builtin_extern.zig+7

...	@@ -1,7 +1,11 @@	...	@@ -1,7 +1,11 @@
1	const x = @extern(*comptime_int, .{ .name = "foo" });	1	const x = @extern(*comptime_int, .{ .name = "foo" });
		2	const y = @extern(*fn (u8) u8, .{ .name = "bar" });
2	pub export fn entry() void {	3	pub export fn entry() void {
3	_ = x;	4	_ = x;
4	}	5	}
		6	pub export fn entry2() void {
		7	_ = y;
		8	}
5		9
6	// error	10	// error
7	// backend=stage2	11	// backend=stage2
...	@@ -9,3 +13,6 @@ pub export fn entry() void {	...	@@ -9,3 +13,6 @@ pub export fn entry() void {
9	//	13	//
10	// :1:19: error: extern symbol cannot have type '*comptime_int'	14	// :1:19: error: extern symbol cannot have type '*comptime_int'
11	// :1:19: note: pointer to comptime-only type 'comptime_int'	15	// :1:19: note: pointer to comptime-only type 'comptime_int'
		16	// :2:19: error: extern symbol cannot have type '*fn (u8) u8'
		17	// :2:19: note: pointer to extern function must be 'const'
		18	// :2:19: note: extern function must specify calling convention