Support break in switch and break/continue in do statements

pkg/compiler/lib/src/js_model/locals.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.js_model.locals;
 
 import 'package:kernel/ast.dart' as ir;
 
 import '../closure.dart';
 import '../common.dart';
@@ skipping 73 matching lines @@
   @override
   JumpTarget getJumpTargetForSwitchCase(ir.SwitchCase node) {
     _ensureJumpMap(node);
     throw new UnimplementedError(
         'KernelToLocalsMapImpl.getJumpTargetForSwitchCase');
   }
 
   @override
   JumpTarget getJumpTargetForDo(ir.DoStatement node) {
     _ensureJumpMap(node);
-    return _jumpTargetMap[node.parent];
+    return _jumpTargetMap[node];
   }
 
   @override
   JumpTarget getJumpTargetForLabel(ir.LabeledStatement node) {
     _ensureJumpMap(node);
     return _jumpTargetMap[node];
   }
 
   @override
   JumpTarget getJumpTargetForSwitch(ir.SwitchStatement node) {
     _ensureJumpMap(node);
-    throw new UnimplementedError(
-        'KernelToLocalsMapImpl.getJumpTargetForSwitch');
+    return _jumpTargetMap[node];
   }
 
   @override
   JumpTarget getJumpTargetForFor(ir.ForStatement node) {
     _ensureJumpMap(node);
     return _jumpTargetMap[node];
   }
 
   @override
   JumpTarget getJumpTargetForForIn(ir.ForInStatement node) {
@@ skipping 33 matching lines @@
   JJumpTarget _getJumpTarget(ir.TreeNode node) {
     return jumpTargetMap.putIfAbsent(node, () {
       return new JJumpTarget(member, index++);
     });
   }
 
   @override
   defaultNode(ir.Node node) => node.visitChildren(this);
 
   bool _canBeBreakTarget(ir.TreeNode node) {
     // TODO(johnniwinther): Add more.

[Siggi Cherem (dart-lang), 2017/06/30 18:16:21]

anything more to add for break?

[Johnni Winther, 2017/06/30 19:16:55]

No. Removed.

     return node is ir.ForStatement ||
         node is ir.ForInStatement ||
-        node is ir.WhileStatement;
+        node is ir.WhileStatement ||
+        node is ir.DoStatement ||

[Siggi Cherem (dart-lang), 2017/06/30 18:16:21]

I thought you said there was more to this than just removing the .parent, did
something else change?

[Johnni Winther, 2017/06/30 19:16:55]

The problem was that continue in do requires a label, which we cannot currently
test.

+        node is ir.SwitchStatement;
   }
 
   bool _canBeContinueTarget(ir.TreeNode node) {
     // TODO(johnniwinther): Add more.

[Siggi Cherem (dart-lang), 2017/06/30 18:16:21]

here we are missing continue to switch-case, correct? anything else?

[Johnni Winther, 2017/06/30 19:16:55]

That's the only one.

     return node is ir.ForStatement ||
         node is ir.ForInStatement ||
-        node is ir.WhileStatement;
+        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.
     JJumpTarget target;
     ir.TreeNode body = node.target.body;
     ir.TreeNode parent = node.target.parent;
     if (_canBeBreakTarget(body)) {
@@ skipping 87 matching lines @@
       sb.write(memberContext.enclosingClass.name);
       sb.write('.');
     }
     sb.write(memberContext.name);
     sb.write('#');
     sb.write(name);
     sb.write(')');
     return sb.toString();
   }
 }