Skip to content

Commit 24511ad

Browse files
vladimavladima
committed
do not emit explicit 'continue' in converted loops
1 parent 5e53ba0 commit 24511ad

10 files changed

Lines changed: 101 additions & 56 deletions

‎src/compiler/emitter.ts‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3232,8 +3232,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
32323232

32333233
// loop is considered simple if it does not have any return statements or break\continue that transfer control outside of the loop
32343234
// simple loops are emitted as just 'loop()';
3235+
// NOTE: if loop uses only 'continue' it still will be emitted as simple loop
32353236
const isSimpleLoop =
3236-
!loop.state.nonLocalJumps &&
3237+
!(loop.state.nonLocalJumps & ~Jump.Continue) &&
32373238
!loop.state.labeledNonLocalBreaks &&
32383239
!loop.state.labeledNonLocalContinues;
32393240

@@ -3274,13 +3275,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
32743275
writeLine();
32753276
}
32763277

3277-
if (loop.state.nonLocalJumps & Jump.Continue) {
3278-
write(`if (${loopResult} === "continue") continue;`);
3279-
writeLine();
3280-
}
3281-
32823278
// in case of labeled breaks emit code that either breaks to some known label inside outer loop or delegates jump decision to outer loop
32833279
emitDispatchTableForLabeledJumps(loopResult, loop.state, convertedLoopState);
3280+
// in case of 'continue' we'll just fallthough here
32843281
}
32853282

32863283
if (emitAsBlock) {
@@ -3575,6 +3572,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
35753572
}
35763573
else {
35773574
convertedLoopState.nonLocalJumps |= Jump.Continue;
3575+
// note: return value is emitted only to simplify debugging, call to converted loop body does not do any dispatching on it.
35783576
write(`"continue";`);
35793577
}
35803578
}

‎tests/baselines/reference/blockScopedBindingsReassignedInLoop2.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,9 @@ var _loop_2 = function(x, y) {
7373
};
7474
var out_x_2, out_y_2;
7575
for (var x = 1, y = 2; x < y; ++x, --y) {
76-
var state_2 = _loop_2(x, y);
76+
_loop_2(x, y);
7777
x = out_x_2;
7878
y = out_y_2;
79-
if (state_2 === "continue") continue;
8079
}
8180
var _loop_3 = function(x, y) {
8281
var a = function () { return x++ + y++; };

‎tests/baselines/reference/blockScopedBindingsReassignedInLoop3.js‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,8 @@ var _loop_3 = function(x, y) {
147147
};
148148
var out_a_2_1;
149149
for (var a_2 = 1; a_2 < 5; --a_2) {
150-
var state_3 = _loop_4(a_2);
150+
_loop_4(a_2);
151151
a_2 = out_a_2_1;
152-
if (state_3 === "continue") continue;
153152
}
154153
y = 5;
155154
}
@@ -158,10 +157,9 @@ var _loop_3 = function(x, y) {
158157
};
159158
var out_x_2, out_y_2;
160159
for (var x = 1, y = 2; x < y; ++x, --y) {
161-
var state_4 = _loop_3(x, y);
160+
_loop_3(x, y);
162161
x = out_x_2;
163162
y = out_y_2;
164-
if (state_4 === "continue") continue;
165163
}
166164
var _loop_5 = function(x, y) {
167165
var a = function () { return x++ + y++; };

‎tests/baselines/reference/capturedLetConstInLoop6.js‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,6 @@ for (var _i = 0, _a = []; _i < _a.length; _i++) {
254254
var x = _a[_i];
255255
var state_1 = _loop_1(x);
256256
if (state_1 === "break") break;
257-
if (state_1 === "continue") continue;
258257
}
259258
var _loop_2 = function(x) {
260259
(function () { return x; });
@@ -269,7 +268,6 @@ var _loop_2 = function(x) {
269268
for (var x in []) {
270269
var state_2 = _loop_2(x);
271270
if (state_2 === "break") break;
272-
if (state_2 === "continue") continue;
273271
}
274272
var _loop_3 = function(x) {
275273
(function () { return x; });
@@ -284,7 +282,6 @@ var _loop_3 = function(x) {
284282
for (var x = 0; x < 1; ++x) {
285283
var state_3 = _loop_3(x);
286284
if (state_3 === "break") break;
287-
if (state_3 === "continue") continue;
288285
}
289286
var _loop_4 = function() {
290287
var x;
@@ -300,7 +297,6 @@ var _loop_4 = function() {
300297
while (1 === 1) {
301298
var state_4 = _loop_4();
302299
if (state_4 === "break") break;
303-
if (state_4 === "continue") continue;
304300
}
305301
var _loop_5 = function() {
306302
var x;
@@ -316,7 +312,6 @@ var _loop_5 = function() {
316312
do {
317313
var state_5 = _loop_5();
318314
if (state_5 === "break") break;
319-
if (state_5 === "continue") continue;
320315
} while (1 === 1);
321316
var _loop_6 = function(y) {
322317
var x = 1;
@@ -332,7 +327,6 @@ var _loop_6 = function(y) {
332327
for (var y = 0; y < 1; ++y) {
333328
var state_6 = _loop_6(y);
334329
if (state_6 === "break") break;
335-
if (state_6 === "continue") continue;
336330
}
337331
var _loop_7 = function(x, y) {
338332
(function () { return x + y; });
@@ -347,7 +341,6 @@ var _loop_7 = function(x, y) {
347341
for (var x = 0, y = 1; x < 1; ++x) {
348342
var state_7 = _loop_7(x, y);
349343
if (state_7 === "break") break;
350-
if (state_7 === "continue") continue;
351344
}
352345
var _loop_8 = function() {
353346
var x, y;
@@ -363,7 +356,6 @@ var _loop_8 = function() {
363356
while (1 === 1) {
364357
var state_8 = _loop_8();
365358
if (state_8 === "break") break;
366-
if (state_8 === "continue") continue;
367359
}
368360
var _loop_9 = function() {
369361
var x, y;
@@ -379,7 +371,6 @@ var _loop_9 = function() {
379371
do {
380372
var state_9 = _loop_9();
381373
if (state_9 === "break") break;
382-
if (state_9 === "continue") continue;
383374
} while (1 === 1);
384375
var _loop_10 = function(y) {
385376
var x = 1;
@@ -395,7 +386,6 @@ var _loop_10 = function(y) {
395386
for (var y = 0; y < 1; ++y) {
396387
var state_10 = _loop_10(y);
397388
if (state_10 === "break") break;
398-
if (state_10 === "continue") continue;
399389
}
400390
// ====const
401391
var _loop_11 = function(x) {
@@ -412,7 +402,6 @@ for (var _b = 0, _c = []; _b < _c.length; _b++) {
412402
var x = _c[_b];
413403
var state_11 = _loop_11(x);
414404
if (state_11 === "break") break;
415-
if (state_11 === "continue") continue;
416405
}
417406
var _loop_12 = function(x) {
418407
(function () { return x; });
@@ -427,7 +416,6 @@ var _loop_12 = function(x) {
427416
for (var x in []) {
428417
var state_12 = _loop_12(x);
429418
if (state_12 === "break") break;
430-
if (state_12 === "continue") continue;
431419
}
432420
var _loop_13 = function(x) {
433421
(function () { return x; });
@@ -442,7 +430,6 @@ var _loop_13 = function(x) {
442430
for (var x = 0; x < 1;) {
443431
var state_13 = _loop_13(x);
444432
if (state_13 === "break") break;
445-
if (state_13 === "continue") continue;
446433
}
447434
var _loop_14 = function() {
448435
var x = 1;
@@ -458,7 +445,6 @@ var _loop_14 = function() {
458445
while (1 === 1) {
459446
var state_14 = _loop_14();
460447
if (state_14 === "break") break;
461-
if (state_14 === "continue") continue;
462448
}
463449
var _loop_15 = function() {
464450
var x = 1;
@@ -474,7 +460,6 @@ var _loop_15 = function() {
474460
do {
475461
var state_15 = _loop_15();
476462
if (state_15 === "break") break;
477-
if (state_15 === "continue") continue;
478463
} while (1 === 1);
479464
var _loop_16 = function(y) {
480465
var x = 1;
@@ -490,7 +475,6 @@ var _loop_16 = function(y) {
490475
for (var y = 0; y < 1;) {
491476
var state_16 = _loop_16(y);
492477
if (state_16 === "break") break;
493-
if (state_16 === "continue") continue;
494478
}
495479
var _loop_17 = function(x, y) {
496480
(function () { return x + y; });
@@ -505,7 +489,6 @@ var _loop_17 = function(x, y) {
505489
for (var x = 0, y = 1; x < 1;) {
506490
var state_17 = _loop_17(x, y);
507491
if (state_17 === "break") break;
508-
if (state_17 === "continue") continue;
509492
}
510493
var _loop_18 = function() {
511494
var x = 1, y = 1;
@@ -521,7 +504,6 @@ var _loop_18 = function() {
521504
while (1 === 1) {
522505
var state_18 = _loop_18();
523506
if (state_18 === "break") break;
524-
if (state_18 === "continue") continue;
525507
}
526508
var _loop_19 = function() {
527509
var x = 1, y = 1;
@@ -537,7 +519,6 @@ var _loop_19 = function() {
537519
do {
538520
var state_19 = _loop_19();
539521
if (state_19 === "break") break;
540-
if (state_19 === "continue") continue;
541522
} while (1 === 1);
542523
var _loop_20 = function(y) {
543524
var x = 1;
@@ -553,5 +534,4 @@ var _loop_20 = function(y) {
553534
for (var y = 0; y < 1;) {
554535
var state_20 = _loop_20(y);
555536
if (state_20 === "break") break;
556-
if (state_20 === "continue") continue;
557537
}

‎tests/baselines/reference/capturedLetConstInLoop7.js‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,6 @@ l0: for (var _i = 0, _a = []; _i < _a.length; _i++) {
397397
var x = _a[_i];
398398
var state_1 = _loop_1(x);
399399
if (state_1 === "break") break;
400-
if (state_1 === "continue") continue;
401400
switch(state_1) {
402401
case "break-l0": break l0;
403402
case "continue-l0": continue l0;
@@ -422,7 +421,6 @@ var _loop_2 = function(x) {
422421
l00: for (var x in []) {
423422
var state_2 = _loop_2(x);
424423
if (state_2 === "break") break;
425-
if (state_2 === "continue") continue;
426424
switch(state_2) {
427425
case "break-l00": break l00;
428426
case "continue-l00": continue l00;
@@ -447,7 +445,6 @@ var _loop_3 = function(x) {
447445
l1: for (var x = 0; x < 1; ++x) {
448446
var state_3 = _loop_3(x);
449447
if (state_3 === "break") break;
450-
if (state_3 === "continue") continue;
451448
switch(state_3) {
452449
case "break-l1": break l1;
453450
case "continue-l1": continue l1;
@@ -473,7 +470,6 @@ var _loop_4 = function() {
473470
l2: while (1 === 1) {
474471
var state_4 = _loop_4();
475472
if (state_4 === "break") break;
476-
if (state_4 === "continue") continue;
477473
switch(state_4) {
478474
case "break-l2": break l2;
479475
case "continue-l2": continue l2;
@@ -499,7 +495,6 @@ var _loop_5 = function() {
499495
l3: do {
500496
var state_5 = _loop_5();
501497
if (state_5 === "break") break;
502-
if (state_5 === "continue") continue;
503498
switch(state_5) {
504499
case "break-l3": break l3;
505500
case "continue-l3": continue l3;
@@ -525,7 +520,6 @@ var _loop_6 = function(y) {
525520
l4: for (var y = 0; y < 1; ++y) {
526521
var state_6 = _loop_6(y);
527522
if (state_6 === "break") break;
528-
if (state_6 === "continue") continue;
529523
switch(state_6) {
530524
case "break-l4": break l4;
531525
case "continue-l4": continue l4;
@@ -550,7 +544,6 @@ var _loop_7 = function(x, y) {
550544
l5: for (var x = 0, y = 1; x < 1; ++x) {
551545
var state_7 = _loop_7(x, y);
552546
if (state_7 === "break") break;
553-
if (state_7 === "continue") continue;
554547
switch(state_7) {
555548
case "break-l5": break l5;
556549
case "continue-l5": continue l5;
@@ -576,7 +569,6 @@ var _loop_8 = function() {
576569
l6: while (1 === 1) {
577570
var state_8 = _loop_8();
578571
if (state_8 === "break") break;
579-
if (state_8 === "continue") continue;
580572
switch(state_8) {
581573
case "break-l6": break l6;
582574
case "continue-l6": continue l6;
@@ -602,7 +594,6 @@ var _loop_9 = function() {
602594
l7: do {
603595
var state_9 = _loop_9();
604596
if (state_9 === "break") break;
605-
if (state_9 === "continue") continue;
606597
switch(state_9) {
607598
case "break-l7": break l7;
608599
case "continue-l7": continue l7;
@@ -628,7 +619,6 @@ var _loop_10 = function(y) {
628619
l8: for (var y = 0; y < 1; ++y) {
629620
var state_10 = _loop_10(y);
630621
if (state_10 === "break") break;
631-
if (state_10 === "continue") continue;
632622
switch(state_10) {
633623
case "break-l8": break l8;
634624
case "continue-l8": continue l8;
@@ -655,7 +645,6 @@ l0_c: for (var _b = 0, _c = []; _b < _c.length; _b++) {
655645
var x = _c[_b];
656646
var state_11 = _loop_11(x);
657647
if (state_11 === "break") break;
658-
if (state_11 === "continue") continue;
659648
switch(state_11) {
660649
case "break-l0_c": break l0_c;
661650
case "continue-l0_c": continue l0_c;
@@ -680,7 +669,6 @@ var _loop_12 = function(x) {
680669
l00_c: for (var x in []) {
681670
var state_12 = _loop_12(x);
682671
if (state_12 === "break") break;
683-
if (state_12 === "continue") continue;
684672
switch(state_12) {
685673
case "break-l00_c": break l00_c;
686674
case "continue-l00_c": continue l00_c;
@@ -705,7 +693,6 @@ var _loop_13 = function(x) {
705693
l1_c: for (var x = 0; x < 1;) {
706694
var state_13 = _loop_13(x);
707695
if (state_13 === "break") break;
708-
if (state_13 === "continue") continue;
709696
switch(state_13) {
710697
case "break-l1_c": break l1_c;
711698
case "continue-l1_c": continue l1_c;
@@ -731,7 +718,6 @@ var _loop_14 = function() {
731718
l2_c: while (1 === 1) {
732719
var state_14 = _loop_14();
733720
if (state_14 === "break") break;
734-
if (state_14 === "continue") continue;
735721
switch(state_14) {
736722
case "break-l2_c": break l2_c;
737723
case "continue-l2_c": continue l2_c;
@@ -757,7 +743,6 @@ var _loop_15 = function() {
757743
l3_c: do {
758744
var state_15 = _loop_15();
759745
if (state_15 === "break") break;
760-
if (state_15 === "continue") continue;
761746
switch(state_15) {
762747
case "break-l3_c": break l3_c;
763748
case "continue-l3_c": continue l3_c;
@@ -783,7 +768,6 @@ var _loop_16 = function(y) {
783768
l4_c: for (var y = 0; y < 1;) {
784769
var state_16 = _loop_16(y);
785770
if (state_16 === "break") break;
786-
if (state_16 === "continue") continue;
787771
switch(state_16) {
788772
case "break-l4_c": break l4_c;
789773
case "continue-l4_c": continue l4_c;
@@ -808,7 +792,6 @@ var _loop_17 = function(x, y) {
808792
l5_c: for (var x = 0, y = 1; x < 1;) {
809793
var state_17 = _loop_17(x, y);
810794
if (state_17 === "break") break;
811-
if (state_17 === "continue") continue;
812795
switch(state_17) {
813796
case "break-l5_c": break l5_c;
814797
case "continue-l5_c": continue l5_c;
@@ -834,7 +817,6 @@ var _loop_18 = function() {
834817
l6_c: while (1 === 1) {
835818
var state_18 = _loop_18();
836819
if (state_18 === "break") break;
837-
if (state_18 === "continue") continue;
838820
switch(state_18) {
839821
case "break-l6_c": break l6_c;
840822
case "continue-l6_c": continue l6_c;
@@ -860,7 +842,6 @@ var _loop_19 = function() {
860842
l7_c: do {
861843
var state_19 = _loop_19();
862844
if (state_19 === "break") break;
863-
if (state_19 === "continue") continue;
864845
switch(state_19) {
865846
case "break-l7_c": break l7_c;
866847
case "continue-l7_c": continue l7_c;
@@ -886,7 +867,6 @@ var _loop_20 = function(y) {
886867
l8_c: for (var y = 0; y < 1;) {
887868
var state_20 = _loop_20(y);
888869
if (state_20 === "break") break;
889-
if (state_20 === "continue") continue;
890870
switch(state_20) {
891871
case "break-l8_c": break l8_c;
892872
case "continue-l8_c": continue l8_c;

0 commit comments

Comments
 (0)