Commit d41a5105cd6222564dfe6bad9cff2c445847c6b3 | zig

author	Veikka Tuominen <git@vexu.eu> 2021-06-07 23:49:28+03:00
committer	Veikka Tuominen <git@vexu.eu> 2021-06-08 10:15:34+03:00
log	d41a5105cd6222564dfe6bad9cff2c445847c6b3
tree	c62fb79d125919a206a6087d060802d70a1b504a
parent	7efd7bc3b8cc403814c0aa62be0a17ff25b33902

stage2: fix repeat_inline skipping first instruction in block

Co-authored-by: Andrew Kelley <andrew@ziglang.org>

2 files changed, 42 insertions(+), 1 deletions(-)

src
- Sema.zig
test
- stage2
  - test.zig

src/Sema.zig+21-1

 @@ -147,7 +147,7 @@ pub fn analyzeBody(
     // directly jump to the next one, rather than detouring through the loop
     // continue expression. Related: https://github.com/ziglang/zig/issues/8220
     var i: usize = 0;
-    while (true) : (i += 1) {
+    while (true) {
         const inst = body[i];
         const air_inst = switch (tags[inst]) {
             // zig fmt: off
 @@ -394,78 +394,97 @@ pub fn analyzeBody(
             // putting them into the map.
             .breakpoint => {
                 try sema.zirBreakpoint(block, inst);
+                i += 1;
                 continue;
             },
             .fence => {
                 try sema.zirFence(block, inst);
+                i += 1;
                 continue;
             },
             .dbg_stmt => {
                 try sema.zirDbgStmt(block, inst);
+                i += 1;
                 continue;
             },
             .ensure_err_payload_void => {
                 try sema.zirEnsureErrPayloadVoid(block, inst);
+                i += 1;
                 continue;
             },
             .ensure_result_non_error => {
                 try sema.zirEnsureResultNonError(block, inst);
+                i += 1;
                 continue;
             },
             .ensure_result_used => {
                 try sema.zirEnsureResultUsed(block, inst);
+                i += 1;
                 continue;
             },
             .set_eval_branch_quota => {
                 try sema.zirSetEvalBranchQuota(block, inst);
+                i += 1;
                 continue;
             },
             .store => {
                 try sema.zirStore(block, inst);
+                i += 1;
                 continue;
             },
             .store_node => {
                 try sema.zirStoreNode(block, inst);
+                i += 1;
                 continue;
             },
             .store_to_block_ptr => {
                 try sema.zirStoreToBlockPtr(block, inst);
+                i += 1;
                 continue;
             },
             .store_to_inferred_ptr => {
                 try sema.zirStoreToInferredPtr(block, inst);
+                i += 1;
                 continue;
             },
             .resolve_inferred_alloc => {
                 try sema.zirResolveInferredAlloc(block, inst);
+                i += 1;
                 continue;
             },
             .validate_struct_init_ptr => {
                 try sema.zirValidateStructInitPtr(block, inst);
+                i += 1;
                 continue;
             },
             .validate_array_init_ptr => {
                 try sema.zirValidateArrayInitPtr(block, inst);
+                i += 1;
                 continue;
             },
             .@"export" => {
                 try sema.zirExport(block, inst);
+                i += 1;
                 continue;
             },
             .set_align_stack => {
                 try sema.zirSetAlignStack(block, inst);
+                i += 1;
                 continue;
             },
             .set_cold => {
                 try sema.zirSetAlignStack(block, inst);
+                i += 1;
                 continue;
             },
             .set_float_mode => {
                 try sema.zirSetFloatMode(block, inst);
+                i += 1;
                 continue;
             },
             .set_runtime_safety => {
                 try sema.zirSetRuntimeSafety(block, inst);
+                i += 1;
                 continue;
             },
 @@ -510,6 +529,7 @@ pub fn analyzeBody(
         if (air_inst.ty.isNoReturn())
             return always_noreturn;
         try map.put(sema.gpa, inst, air_inst);
+        i += 1;
     }
 }

test/stage2/test.zig+21

...	@@ -1475,6 +1475,7 @@ pub fn addCases(ctx: *TestContext) !void {	...	@@ -1475,6 +1475,7 @@ pub fn addCases(ctx: *TestContext) !void {
1475	\\ x += 1;	1475	\\ x += 1;
1476	\\ if (x != 1) unreachable;	1476	\\ if (x != 1) unreachable;
1477	\\}	1477	\\}
		1478	\\pub fn main() void {}
1478	, &.{":4:17: error: unable to resolve comptime value"});	1479	, &.{":4:17: error: unable to resolve comptime value"});
1479		1480
1480	case.addError(	1481	case.addError(
...	@@ -1501,5 +1502,25 @@ pub fn addCases(ctx: *TestContext) !void {	...	@@ -1501,5 +1502,25 @@ pub fn addCases(ctx: *TestContext) !void {
1501	\\ if (x != 2) unreachable;	1502	\\ if (x != 2) unreachable;
1502	\\}	1503	\\}
1503	, "");	1504	, "");
		1505
		1506	case.addCompareOutput(
		1507	\\pub fn main() void {
		1508	\\ comptime var i: u64 = 2;
		1509	\\ inline while (i < 6) : (i+=1) {
		1510	\\ print(i);
		1511	\\ }
		1512	\\}
		1513	\\fn print(len: usize) void {
		1514	\\ asm volatile ("syscall"
		1515	\\ :
		1516	\\ : [number] "{rax}" (1),
		1517	\\ [arg1] "{rdi}" (1),
		1518	\\ [arg2] "{rsi}" (@ptrToInt("Hello")),
		1519	\\ [arg3] "{rdx}" (len)
		1520	\\ : "rcx", "r11", "memory"
		1521	\\ );
		1522	\\ return;
		1523	\\}
		1524	, "HeHelHellHello");
1504	}	1525	}
1505	}	1526	}