Commit b626977f45f5175ae26e212b20adbd514649d6e5 | zig

author	Veikka Tuominen <git@vexu.eu> 2022-10-05 14:14:04+03:00
committer	Veikka Tuominen <git@vexu.eu> 2022-10-06 15:39:06+03:00
log	b626977f45f5175ae26e212b20adbd514649d6e5
tree	49704d5dc325437a325e038bbac280957b4545eb
parent	ba4aa12098a0a9def52582cecd5b0b664ded14d8

Sema: create sub block for inline loops

Closes #13038

2 files changed, 30 insertions(+), 5 deletions(-)

src
- Sema.zig
test
- behavior
  - eval.zig

src/Sema.zig+16-5

 @@ -1302,17 +1302,28 @@ fn analyzeBodyInner(
                 // current list of parameters and restore it later.
                 // Note: this probably needs to be resolved in a more general manner.
                 const prev_params = block.params;
-                const prev_inline_block = block.inline_block;
+                const need_sub_block = tags[inline_body[inline_body.len - 1]] == .repeat_inline;
-                if (tags[inline_body[inline_body.len - 1]] == .repeat_inline) {
+                var sub_block = block;
-                    block.inline_block = inline_body[0];
+                var block_space: Block = undefined;
+                // NOTE: this has to be done like this because branching in
+                // defers here breaks stage1.
+                block_space.instructions = .{};
+                if (need_sub_block) {
+                    block_space = block.makeSubBlock();
+                    block_space.inline_block = inline_body[0];
+                    sub_block = &block_space;
                 }
                 block.params = .{};
                 defer {
                     block.params.deinit(gpa);
                     block.params = prev_params;
-                    block.inline_block = prev_inline_block;
+                    block_space.instructions.deinit(gpa);
                 }
-                const opt_break_data = try sema.analyzeBodyBreak(block, inline_body);
+                const opt_break_data = try sema.analyzeBodyBreak(sub_block, inline_body);
+                if (need_sub_block) {
+                    try block.instructions.appendSlice(gpa, block_space.instructions.items);
+                }
                 // A runtime conditional branch that needs a post-hoc block to be
                 // emitted communicates this by mapping the block index into the inst map.
                 if (map.get(inst)) |new_block_ref| ph: {

test/behavior/eval.zig+14

...	@@ -1398,3 +1398,17 @@ test "continue in inline for inside a comptime switch" {	...	@@ -1398,3 +1398,17 @@ test "continue in inline for inside a comptime switch" {
1398	}	1398	}
1399	try expect(count == 4);	1399	try expect(count == 4);
1400	}	1400	}
		1401
		1402	test "continue nested inline for loop" {
		1403	var a: u8 = 0;
		1404	loop: inline for ([_]u8{ 1, 2 }) \|x\| {
		1405	inline for ([_]u8{1}) \|y\| {
		1406	if (x == y) {
		1407	continue :loop;
		1408	}
		1409	}
		1410	a = x;
		1411	try expect(x == 2);
		1412	}
		1413	try expect(a == 2);
		1414	}