Handle continue and break in for-in and while loops

pkg/compiler/lib/src/kernel/kernel_backend_strategy.dart

 // Copyright (c) 2017, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library dart2js.kernel.backend_strategy;
 
 import 'package:kernel/ast.dart' as ir;
 
 import '../backend_strategy.dart';
 import '../closure.dart';
@@ skipping 353 matching lines @@
 
   @override
   JumpTarget getJumpTargetForFor(ir.ForStatement node) {
     _ensureJumpMap(node);
     return _jumpTargetMap[node];
   }
 
   @override
   JumpTarget getJumpTargetForForIn(ir.ForInStatement node) {
     _ensureJumpMap(node);
-    return _jumpTargetMap[node.parent];
+    return _jumpTargetMap[node];
   }
 
   @override
   JumpTarget getJumpTargetForWhile(ir.WhileStatement node) {
     _ensureJumpMap(node);
-    return _jumpTargetMap[node.parent];
+    return _jumpTargetMap[node];
   }
 
   @override
   Local getLocal(ir.VariableDeclaration node) {
     return _map.putIfAbsent(node, () {
       return new KLocal(node.name, currentMember);
     });
   }
 
   @override
@@ skipping 16 matching lines @@
     return jumpTargetMap.putIfAbsent(node, () {
       return new KJumpTarget(member, index++);
     });
   }
 
   @override
   defaultNode(ir.Node node) => node.visitChildren(this);
 
   bool _canBeBreakTarget(ir.TreeNode node) {
     // TODO(johnniwinther): Add more.
-    return node is ir.ForStatement;
+    return node is ir.ForStatement ||
+        node is ir.ForInStatement ||
+        node is ir.WhileStatement ||
+        node is ir.DoStatement;

[Siggi Cherem (dart-lang), 2017/06/26 17:25:28]

remove this `.parent` in getJumpTargetForDo as well? Maybe add a test for it
too?

[Johnni Winther, 2017/06/27 09:02:12]

Removed. Do statements are not handled yet.

   }
 
   bool _canBeContinueTarget(ir.TreeNode node) {
     // TODO(johnniwinther): Add more.
-    return node is ir.ForStatement;
+    return node is ir.ForStatement ||
+        node is ir.ForInStatement ||
+        node is ir.WhileStatement ||
+        node is ir.DoStatement;
   }
 
   @override
   visitBreakStatement(ir.BreakStatement node) {
     // TODO(johnniwinther): Add labels if the enclosing loop is not the implicit
     // break target.
     KJumpTarget target;
     ir.TreeNode body = node.target.body;
     ir.TreeNode parent = node.target.parent;
     if (_canBeBreakTarget(body)) {
@@ skipping 135 matching lines @@
   Iterable<ClassEntity> sortClasses(Iterable<ClassEntity> classes) {
     return classes.toList()
       ..sort((ClassEntity a, ClassEntity b) {
         int r = _compareLibraries(a.library, b.library);
         if (r != 0) return r;
         return _compareNodes(
             a, elementMap.getClassNode(a), b, elementMap.getClassNode(b));
       });
   }
 }