Commit 315d4e84425ddff888de8d464f657981e4c45da7 | zig

author	Veikka Tuominen <git@vexu.eu> 2022-02-26 18:06:06+02:00
committer	Veikka Tuominen <git@vexu.eu> 2022-02-26 18:08:31+02:00
log	315d4e84425ddff888de8d464f657981e4c45da7
tree	6c5f4bf623b276963cec98ebbf713d2a752e9e01
parent	ff72b8a8194573bc1d7f95cbf3228b363194c775

stage2: do not require function when evaluating typeOf

We only care about the instructions type; it will never actually be codegen'd.

3 files changed, 20 insertions(+), 10 deletions(-)

src
- Sema.zig
test
- behavior.zig
- behavior
  - bugs
    4328.zig

src/Sema.zig+3-2

...	...	@@ -13427,7 +13427,7 @@ fn zirBuiltinExtern(
13427	13427	}
13428	13428
13429	13429	fn requireFunctionBlock(sema: Sema, block: Block, src: LazySrcLoc) !void {
13430		if (sema.func == null) {
	13430	if (sema.func == null and !block.is_typeof) {
13431	13431	return sema.fail(block, src, "instruction illegal outside function body", .{});
13432	13432	}
13433	13433	}
...	...	@@ -14194,7 +14194,8 @@ fn fieldCallBind(
14194	14194	if (first_param_tag == .var_args_param or
14195	14195	first_param_tag == .generic_poison or (
14196	14196	first_param_type.zigTypeTag() == .Pointer and
14197		first_param_type.ptrSize() == .One and
	14197	(first_param_type.ptrSize() == .One or
	14198	first_param_type.ptrSize() == .C) and
14198	14199	first_param_type.childType().eql(concrete_ty)))
14199	14200	{
14200	14201	// zig fmt: on

test/behavior.zig+1-1

...	...	@@ -38,6 +38,7 @@ test {
38	38	_ = @import("behavior/bugs/3112.zig");
39	39	_ = @import("behavior/bugs/3367.zig");
40	40	_ = @import("behavior/bugs/3586.zig");
	41	_ = @import("behavior/bugs/4328.zig");
41	42	_ = @import("behavior/bugs/4560.zig");
42	43	_ = @import("behavior/bugs/4769_a.zig");
43	44	_ = @import("behavior/bugs/4769_b.zig");
...	...	@@ -150,7 +151,6 @@ test {
150	151	_ = @import("behavior/bugs/1851.zig");
151	152	_ = @import("behavior/bugs/3384.zig");
152	153	_ = @import("behavior/bugs/3779.zig");
153		_ = @import("behavior/bugs/4328.zig");
154	154	_ = @import("behavior/bugs/5398.zig");
155	155	_ = @import("behavior/bugs/5413.zig");
156	156	_ = @import("behavior/bugs/5487.zig");

test/behavior/bugs/4328.zig+16-7

...	...	@@ -1,4 +1,5 @@
1		const expectEqual = @import("std").testing.expectEqual;
	1	const expect = @import("std").testing.expect;
	2	const builtin = @import("builtin");
2	3
3	4	const FILE = extern struct {
4	5	dummy_field: u8,
...	...	@@ -16,18 +17,20 @@ const S = extern struct {
16	17	};
17	18
18	19	test "Extern function calls in @TypeOf" {
	20	if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest;
	21
19	22	const Test = struct {
20	23	fn test_fn_1(a: anytype, b: anytype) @TypeOf(printf("%d %s\n", a, b)) {
21	24	return 0;
22	25	}
23	26
24		fn test_fn_2(a: anytype) @TypeOf((S{ .state = 0 }).s_do_thing(a)) {
	27	fn test_fn_2(s: anytype, a: anytype) @TypeOf(s.s_do_thing(a)) {
25	28	return 1;
26	29	}
27	30
28	31	fn doTheTest() !void {
29		try expectEqual(c_int, @TypeOf(test_fn_1(0, 42)));
30		try expectEqual(c_short, @TypeOf(test_fn_2(0)));
	32	try expect(@TypeOf(test_fn_1(0, 42)) == c_int);
	33	try expect(@TypeOf(test_fn_2(&S{ .state = 1 }, 0)) == c_short);
31	34	}
32	35	};
33	36
...	...	@@ -36,13 +39,15 @@ test "Extern function calls in @TypeOf" {
36	39	}
37	40
38	41	test "Peer resolution of extern function calls in @TypeOf" {
	42	if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest;
	43
39	44	const Test = struct {
40	45	fn test_fn() @TypeOf(ftell(null), fputs(null, null)) {
41	46	return 0;
42	47	}
43	48
44	49	fn doTheTest() !void {
45		try expectEqual(c_long, @TypeOf(test_fn()));
	50	try expect(@TypeOf(test_fn()) == c_long);
46	51	}
47	52	};
48	53
...	...	@@ -51,6 +56,10 @@ test "Peer resolution of extern function calls in @TypeOf" {
51	56	}
52	57
53	58	test "Extern function calls, dereferences and field access in @TypeOf" {
	59	if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
	60	if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
	61	if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest;
	62
54	63	const Test = struct {
55	64	fn test_fn_1(a: c_long) @TypeOf(fopen("test", "r").*) {
56	65	_ = a;
...	...	@@ -63,8 +72,8 @@ test "Extern function calls, dereferences and field access in @TypeOf" {
63	72	}
64	73
65	74	fn doTheTest() !void {
66		try expectEqual(FILE, @TypeOf(test_fn_1(0)));
67		try expectEqual(u8, @TypeOf(test_fn_2(0)));
	75	try expect(@TypeOf(test_fn_1(0)) == FILE);
	76	try expect(@TypeOf(test_fn_2(0)) == u8);
68	77	}
69	78	};
70	79