Fix(compiler): ForStatement - continue must jump to incrementor if it's exists or startBlock

ovr · ovr · commit 81fbd22ed5a0 · 2019-02-02T15:35:47.000+09:00
diff --git a/src/backend/llvm/code-generation/for-statement.ts b/src/backend/llvm/code-generation/for-statement.ts
@@ -45,29 +45,36 @@ export class ForStatementGenerator implements NodeGenerateInterface<ts.ForStatem
             builder.setInsertionPoint(bodyBlock);
         }
 
-        ctx.scope.breakBlock = next;
-        ctx.scope.continueBlock = startBlock;
-
-        builder.setInsertionPoint(bodyBlock);
-        passStatement(node.statement, ctx, builder);
+        /**
+         * Continue block can be incrementer block: for (i = 0; i < 100; i++)
+         * or next block: for (i = 0; i < 100; )
+         */
+        let continueBlock: llvm.BasicBlock = startBlock;
 
         if (node.incrementor) {
             const incrementer = llvm.BasicBlock.create(ctx.llvmContext, "for.inc");
             ctx.scope.enclosureFunction.llvmFunction.addBasicBlock(incrementer);
 
-            // jump from bodyBlock to incrementer
-            builder.createBr(incrementer);
             builder.setInsertionPoint(incrementer);
-
             passStatement(<any>node.incrementor, ctx, builder);
+
+            builder.createBr(startBlock);
+
+            continueBlock = incrementer;
         }
 
+        ctx.scope.breakBlock = next;
+        ctx.scope.continueBlock = continueBlock;
+
+        builder.setInsertionPoint(bodyBlock);
+        passStatement(node.statement, ctx, builder);
+
         // next iteration of cycle
-        builder.createBr(startBlock);
+        builder.createBr(continueBlock);
 
         ctx.scope.breakBlock = null;
         ctx.scope.continueBlock = null;
 
         builder.setInsertionPoint(next);
     }
-}
+}
diff --git a/tests/snapshots/math/for.ts b/tests/snapshots/math/for.ts
@@ -1,6 +1,8 @@
 
 {
     function calculateTotalFromRange(start: number, end: number): number {
+        console_log("calculateTotalFromRange");
+
         let total: number = 0;
 
         for (let i = start; i < end; i++) {
@@ -11,6 +13,8 @@
     }
 
     function simpleBreak(): number {
+        console_log("simpleBreak");
+
         let total: number = 0;
 
         for (let i = 0; ; i++) {
@@ -25,9 +29,11 @@
     }
 
     function simpleContinue(): number {
+        console_log("simpleContinue");
+
         let total: number = 0;
 
-        for (let i = 0; i++; i++) {
+        for (let i = 0; i < 100; i++) {
             if (i > 50) {
                 continue;
             }
@@ -38,8 +44,8 @@
         return total;
     }
 
-    calculateTotalFromRange(1, 100);
-    calculateTotalFromRange(50, 100);
-    simpleBreak();
-    simpleContinue();
+    console_log(calculateTotalFromRange(1, 100));
+    console_log(calculateTotalFromRange(50, 100));
+    console_log(simpleBreak());
+    console_log(simpleContinue());
 }
diff --git a/tests/snapshots/math/for.ts.stdout b/tests/snapshots/math/for.ts.stdout
@@ -0,0 +1,8 @@
+calculateTotalFromRange
+4950.000000
+calculateTotalFromRange
+3725.000000
+simpleBreak
+5151.000000
+simpleContinue
+1275.000000

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`
`2`	`2`	`{`
`3`	`3`	`function calculateTotalFromRange(start: number, end: number): number {`
	`4`	`+ console_log("calculateTotalFromRange");`
	`5`	`+`
`4`	`6`	`let total: number = 0;`
`5`	`7`
`6`	`8`	`for (let i = start; i < end; i++) {`
`@@ -11,6 +13,8 @@`
`11`	`13`	`}`
`12`	`14`
`13`	`15`	`function simpleBreak(): number {`
	`16`	`+ console_log("simpleBreak");`
	`17`	`+`
`14`	`18`	`let total: number = 0;`
`15`	`19`
`16`	`20`	`for (let i = 0; ; i++) {`
`@@ -25,9 +29,11 @@`
`25`	`29`	`}`
`26`	`30`
`27`	`31`	`function simpleContinue(): number {`
	`32`	`+ console_log("simpleContinue");`
	`33`	`+`
`28`	`34`	`let total: number = 0;`
`29`	`35`
`30`		`- for (let i = 0; i++; i++) {`
	`36`	`+ for (let i = 0; i < 100; i++) {`
`31`	`37`	`if (i > 50) {`
`32`	`38`	`continue;`
`33`	`39`	`}`
`@@ -38,8 +44,8 @@`
`38`	`44`	`return total;`
`39`	`45`	`}`
`40`	`46`
`41`		`- calculateTotalFromRange(1, 100);`
`42`		`- calculateTotalFromRange(50, 100);`
`43`		`- simpleBreak();`
`44`		`- simpleContinue();`
	`47`	`+ console_log(calculateTotalFromRange(1, 100));`
	`48`	`+ console_log(calculateTotalFromRange(50, 100));`
	`49`	`+ console_log(simpleBreak());`
	`50`	`+ console_log(simpleContinue());`
`45`	`51`	`}`