Commit 4a5628e7306a242ce0d2f14f09eaf17ad4ae87b2 | zig

author	Veikka Tuominen <git@vexu.eu> 2023-03-26 15:13:51+03:00
committer	Veikka Tuominen <git@vexu.eu> 2023-03-26 15:14:03+03:00
log	4a5628e7306a242ce0d2f14f09eaf17ad4ae87b2
tree	9b862cb1efa33705e150c306e6a40b1c7c9dd08a
parent	3a7fe0d0105ed69354960896a5d9eadd9dee3563

Module: fix lazy srcloc resolution for new for loop syntax

Closes #15081

2 files changed, 23 insertions(+), 9 deletions(-)

src
- Module.zig
test
- cases
  - compile_errors
    comptime_if_inside_runtime_for.zig

src/Module.zig+9-9

 @@ -2459,7 +2459,7 @@ pub const SrcLoc = struct {
                 return nodeToSpan(tree, node_datas[asm_output].lhs);
             },
-            .node_offset_for_cond, .node_offset_if_cond => |node_off| {
+            .node_offset_if_cond => |node_off| {
                 const tree = try src_loc.file_scope.getTree(gpa);
                 const node = src_loc.declRelativeToNodeIndex(node_off);
                 const node_tags = tree.nodes.items(.tag);
 @@ -2471,9 +2471,16 @@ pub const SrcLoc = struct {
                     .while_simple,
                     .while_cont,
                     .@"while",
+                    => tree.fullWhile(node).?.ast.cond_expr,
                     .for_simple,
                     .@"for",
-                    => tree.fullWhile(node).?.ast.cond_expr,
+                    => {
+                        const inputs = tree.fullFor(node).?.ast.inputs;
+                        const start = tree.firstToken(inputs[0]);
+                        const end = tree.lastToken(inputs[inputs.len - 1]);
+                        return tokensToSpan(tree, start, end, start);
+                    },
                     .@"orelse" => node,
                     .@"catch" => node,
 @@ -2967,12 +2974,6 @@ pub const LazySrcLoc = union(enum) {
     /// The source location points to the initializer of a var decl.
     /// The Decl is determined contextually.
     node_offset_var_decl_init: i32,
-    /// The source location points to a for loop condition expression,
-    /// found by taking this AST node index offset from the containing
-    /// Decl AST node, which points to a for loop AST node. Next, navigate
-    /// to the condition expression.
-    /// The Decl is determined contextually.
-    node_offset_for_cond: i32,
     /// The source location points to the first parameter of a builtin
     /// function call, found by taking this AST node index offset from the containing
     /// Decl AST node, which points to a builtin call AST node. Next, navigate
 @@ -3233,7 +3234,6 @@ pub const LazySrcLoc = union(enum) {
             .node_offset_var_decl_section,
             .node_offset_var_decl_addrspace,
             .node_offset_var_decl_init,
-            .node_offset_for_cond,
             .node_offset_builtin_call_arg0,
             .node_offset_builtin_call_arg1,
             .node_offset_builtin_call_arg2,

test/cases/compile_errors/comptime_if_inside_runtime_for.zig created+14

...	@@ -0,0 +1,14 @@
1	export fn entry() void {
2	var x: u32 = 0;
3	for(0..1, 1..2) \|_, _\| {
4	var y = x + if(x == 0) 1 else 0;
5	_ = y;
6	}
7	}
8
9	// error
10	// backend=stage2
11	// target=native
12	//
13	// :4:15: error: value with comptime-only type 'comptime_int' depends on runtime control flow
14	// :3:6: note: runtime control flow here