Commit 2252dcc508c53dc302ec1f919c4792a7f00ce125 | zig

author	Bogdan Romanyuk <wrongnull@gmail.com> 2023-11-25 20:29:07+03:00
committer	GitHub <noreply@github.com> 2023-11-25 17:29:07+00:00
log	2252dcc508c53dc302ec1f919c4792a7f00ce125
tree	5b4fb9d2ded6453efa46012d98e6503904c3aee4
parent	bece97ef248ad36d31a48fb761b4a41324c9c5d5
signature	Signed by PGP key 4AEE18F83AFDEB23

Compiler: move checking function-scope-only builtins to AstGen

5 files changed, 92 insertions(+), 44 deletions(-)

src
- AstGen.zig
- Sema.zig
test
- cases
  - compile_errors
    function-only_builtins_outside_function.zig
    setAlignStack_outside_function.zig
    src_outside_function.zig

src/AstGen.zig+22-21

 @@ -8266,6 +8266,28 @@ fn builtinCall(
         }
     }
+    // Check function scope-only builtins
+    if (astgen.fn_block == null) {
+        switch (info.tag) {
+            .c_va_arg,
+            .c_va_copy,
+            .c_va_end,
+            .c_va_start,
+            .work_item_id,
+            .work_group_size,
+            .work_group_id,
+            .set_align_stack,
+            .set_cold,
+            .return_address,
+            .frame_address,
+            .breakpoint,
+            .src,
+            => return astgen.failNode(node, "'{s}' outside function scope", .{builtin_name}),
+            else => {},
+        }
+    }
     switch (info.tag) {
         .import => {
             const node_tags = tree.nodes.items(.tag);
 @@ -8802,9 +8824,6 @@ fn builtinCall(
             return rvalue(gz, ri, .void_value, node);
         },
         .c_va_arg => {
-            if (astgen.fn_block == null) {
-                return astgen.failNode(node, "'@cVaArg' outside function scope", .{});
-            }
             const result = try gz.addExtendedPayload(.c_va_arg, Zir.Inst.BinNode{
                 .node = gz.nodeIndexToRelative(node),
                 .lhs = try expr(gz, scope, .{ .rl = .none }, params[0]),
 @@ -8813,9 +8832,6 @@ fn builtinCall(
             return rvalue(gz, ri, result, node);
         },
         .c_va_copy => {
-            if (astgen.fn_block == null) {
-                return astgen.failNode(node, "'@cVaCopy' outside function scope", .{});
-            }
             const result = try gz.addExtendedPayload(.c_va_copy, Zir.Inst.UnNode{
                 .node = gz.nodeIndexToRelative(node),
                 .operand = try expr(gz, scope, .{ .rl = .none }, params[0]),
 @@ -8823,9 +8839,6 @@ fn builtinCall(
             return rvalue(gz, ri, result, node);
         },
         .c_va_end => {
-            if (astgen.fn_block == null) {
-                return astgen.failNode(node, "'@cVaEnd' outside function scope", .{});
-            }
             const result = try gz.addExtendedPayload(.c_va_end, Zir.Inst.UnNode{
                 .node = gz.nodeIndexToRelative(node),
                 .operand = try expr(gz, scope, .{ .rl = .none }, params[0]),
 @@ -8833,9 +8846,6 @@ fn builtinCall(
             return rvalue(gz, ri, result, node);
         },
         .c_va_start => {
-            if (astgen.fn_block == null) {
-                return astgen.failNode(node, "'@cVaStart' outside function scope", .{});
-            }
             if (!astgen.fn_var_args) {
                 return astgen.failNode(node, "'@cVaStart' in a non-variadic function", .{});
             }
 @@ -8843,9 +8853,6 @@ fn builtinCall(
         },
         .work_item_id => {
-            if (astgen.fn_block == null) {
-                return astgen.failNode(node, "'@workItemId' outside function scope", .{});
-            }
             const operand = try comptimeExpr(gz, scope, .{ .rl = .{ .coerced_ty = .u32_type } }, params[0]);
             const result = try gz.addExtendedPayload(.work_item_id, Zir.Inst.UnNode{
                 .node = gz.nodeIndexToRelative(node),
 @@ -8854,9 +8861,6 @@ fn builtinCall(
             return rvalue(gz, ri, result, node);
         },
         .work_group_size => {
-            if (astgen.fn_block == null) {
-                return astgen.failNode(node, "'@workGroupSize' outside function scope", .{});
-            }
             const operand = try comptimeExpr(gz, scope, .{ .rl = .{ .coerced_ty = .u32_type } }, params[0]);
             const result = try gz.addExtendedPayload(.work_group_size, Zir.Inst.UnNode{
                 .node = gz.nodeIndexToRelative(node),
 @@ -8865,9 +8869,6 @@ fn builtinCall(
             return rvalue(gz, ri, result, node);
         },
         .work_group_id => {
-            if (astgen.fn_block == null) {
-                return astgen.failNode(node, "'@workGroupId' outside function scope", .{});
-            }
             const operand = try comptimeExpr(gz, scope, .{ .rl = .{ .coerced_ty = .u32_type } }, params[0]);
             const result = try gz.addExtendedPayload(.work_group_id, Zir.Inst.UnNode{
                 .node = gz.nodeIndexToRelative(node),

src/Sema.zig+1-5

 @@ -6151,9 +6151,6 @@ fn zirSetAlignStack(sema: *Sema, block: *Block, extended: Zir.Inst.Extended.Inst
             alignment.toByteUnitsOptional().?,
         });
     }
-    if (sema.func_index == .none) {
-        return sema.fail(block, src, "@setAlignStack outside function body", .{});
-    }
     const fn_owner_decl = mod.funcOwnerDeclPtr(sema.func_index);
     switch (fn_owner_decl.ty.fnCallingConvention(mod)) {
 @@ -16780,13 +16777,12 @@ fn zirBuiltinSrc(
     block: *Block,
     extended: Zir.Inst.Extended.InstData,
 ) CompileError!Air.Inst.Ref {
+    _ = block;
     const tracy = trace(@src());
     defer tracy.end();
     const mod = sema.mod;
     const extra = sema.code.extraData(Zir.Inst.Src, extended.operand).data;
-    const src = LazySrcLoc.nodeOffset(extra.node);
-    if (sema.func_index == .none) return sema.fail(block, src, "@src outside function", .{});
     const fn_owner_decl = mod.funcOwnerDeclPtr(sema.func_index);
     const ip = &mod.intern_pool;
     const gpa = sema.gpa;

test/cases/compile_errors/function-only_builtins_outside_function.zig created+69

...	@@ -0,0 +1,69 @@
1	comptime {
2	@setAlignStack(1);
3	}
4
5	comptime {
6	@setCold(true);
7	}
8
9	comptime {
10	@src();
11	}
12
13	comptime {
14	@returnAddress();
15	}
16
17	comptime {
18	@frameAddress();
19	}
20
21	comptime {
22	@breakpoint();
23	}
24
25	comptime {
26	@cVaArg(1, 2);
27	}
28
29	comptime {
30	@cVaCopy(1);
31	}
32
33	comptime {
34	@cVaEnd(1);
35	}
36
37	comptime {
38	@cVaStart();
39	}
40
41	comptime {
42	@workItemId(42);
43	}
44
45	comptime {
46	@workGroupSize(42);
47	}
48
49	comptime {
50	@workGroupId(42);
51	}
52
53	// error
54	// backend=stage2
55	// target=native
56	//
57	// :2:5: error: '@setAlignStack' outside function scope
58	// :6:5: error: '@setCold' outside function scope
59	// :10:5: error: '@src' outside function scope
60	// :14:5: error: '@returnAddress' outside function scope
61	// :18:5: error: '@frameAddress' outside function scope
62	// :22:5: error: '@breakpoint' outside function scope
63	// :26:5: error: '@cVaArg' outside function scope
64	// :30:5: error: '@cVaCopy' outside function scope
65	// :34:5: error: '@cVaEnd' outside function scope
66	// :38:5: error: '@cVaStart' outside function scope
67	// :42:5: error: '@workItemId' outside function scope
68	// :46:5: error: '@workGroupSize' outside function scope
69	// :50:5: error: '@workGroupId' outside function scope

test/cases/compile_errors/setAlignStack_outside_function.zig deleted-9

...	@@ -1,9 +0,0 @@
1	comptime {
2	@setAlignStack(16);
3	}
4
5	// error
6	// backend=stage2
7	// target=native
8	//
9	// :2:5: error: @setAlignStack outside function body

test/cases/compile_errors/src_outside_function.zig deleted-9

...	@@ -1,9 +0,0 @@
1	comptime {
2	@src();
3	}
4
5	// error
6	// backend=stage2
7	// target=native
8	//
9	// :2:5: error: @src outside function