Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

do not enforce function parameters to be marked comptime if only called at comptime #18331

Merged
merged 1 commit into from
Jan 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions lib/std/comptime_string_map.zig
Original file line number Diff line number Diff line change
Expand Up @@ -299,3 +299,22 @@ test "ComptimeStringMap redundant insensitive" {

try std.testing.expectEqual(TestEnum.A, map.get("theNeedle").?);
}

test "ComptimeStringMap comptime-only value" {
const map = std.ComptimeStringMap(type, .{
.{ "a", struct {
pub const foo = 1;
} },
.{ "b", struct {
pub const foo = 2;
} },
.{ "c", struct {
pub const foo = 3;
} },
});

try std.testing.expect(map.get("a").?.foo == 1);
try std.testing.expect(map.get("b").?.foo == 2);
try std.testing.expect(map.get("c").?.foo == 3);
try std.testing.expect(map.get("d") == null);
}
4 changes: 2 additions & 2 deletions src/Sema.zig
Original file line number Diff line number Diff line change
Expand Up @@ -9302,7 +9302,7 @@ fn funcCommon(
};
return sema.failWithOwnedErrorMsg(block, msg);
}
if (is_source_decl and requires_comptime and !param_is_comptime and has_body) {
if (is_source_decl and requires_comptime and !param_is_comptime and has_body and !block.is_comptime) {
const msg = msg: {
const msg = try sema.errMsg(block, param_src, "parameter of type '{}' must be declared comptime", .{
param_ty.fmt(mod),
Expand Down Expand Up @@ -9597,7 +9597,7 @@ fn finishFunc(

// If the return type is comptime-only but not dependent on parameters then
// all parameter types also need to be comptime.
if (is_source_decl and opt_func_index != .none and ret_ty_requires_comptime) comptime_check: {
if (is_source_decl and opt_func_index != .none and ret_ty_requires_comptime and !block.is_comptime) comptime_check: {
for (block.params.items(.is_comptime)) |is_comptime| {
if (!is_comptime) break;
} else break :comptime_check;
Expand Down
9 changes: 9 additions & 0 deletions test/behavior/fn.zig
Original file line number Diff line number Diff line change
Expand Up @@ -596,3 +596,12 @@ test "pointer to alias behaves same as pointer to function" {
_ = &a;
try std.testing.expect(S.foo() == a());
}

test "comptime parameters don't have to be marked comptime if only called at comptime" {
const S = struct {
fn foo(x: comptime_int, y: comptime_int) u32 {
return x + y;
}
};
comptime std.debug.assert(S.foo(5, 6) == 11);
}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,34 +3,16 @@ fn F(val: anytype) type {
return struct {};
}
export fn entry() void {
_ = F(void{});
}
const S = struct {
foo: fn () void,
};
fn bar(_: u32) S {
return undefined;
}
export fn entry1() void {
_ = bar();
}
// prioritize other return type errors
fn foo(a: u32) callconv(.C) comptime_int {
return a;
}
export fn entry2() void {
_ = foo(1);
var x: u32 = 0;
_ = &x;
_ = F(x);
}

// error
// backend=stage2
// target=native
//
// :1:20: error: function with comptime-only return type 'type' requires all parameters to be comptime
// :8:11: error: unable to resolve comptime value
// :8:11: note: argument to function being called at comptime must be comptime-known
// :1:20: note: expression is evaluated at comptime because the function returns a comptime-only type 'type'
// :1:20: note: types are not available at runtime
// :1:6: note: param 'val' is required to be comptime
// :11:16: error: function with comptime-only return type 'tmp.S' requires all parameters to be comptime
// :9:10: note: struct requires comptime because of this field
// :9:10: note: use '*const fn () void' for a function pointer type
// :11:8: note: param is required to be comptime
// :18:29: error: return type 'comptime_int' not allowed in function with calling convention 'C'