Handle switch continue

tests/compiler/dart2js/jumps/jump_test.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.
 
 import 'dart:io';
 import 'package:async_helper/async_helper.dart';
 import 'package:compiler/src/commandline_options.dart';
 import 'package:compiler/src/common.dart';
 import 'package:compiler/src/compiler.dart';
 import 'package:compiler/src/diagnostics/diagnostic_listener.dart';
 import 'package:compiler/src/elements/elements.dart';
 import 'package:compiler/src/elements/entities.dart';
 import 'package:compiler/src/elements/jumps.dart';
 import 'package:compiler/src/js_model/locals.dart';
 import 'package:compiler/src/kernel/element_map.dart';
 import 'package:compiler/src/kernel/kernel_backend_strategy.dart';
 import 'package:compiler/src/tree/nodes.dart' as ast;
 import '../equivalence/id_equivalence.dart';
 import '../equivalence/id_equivalence_helper.dart';
 import 'package:kernel/ast.dart' as ir;
 
-main() {
+main(List<String> args) {
   asyncTest(() async {
     Directory dataDir = new Directory.fromUri(Platform.script.resolve('data'));
     await checkTests(dataDir, computeJumpsData, computeKernelJumpsData,
-        options: [Flags.disableTypeInference]);
+        options: [Flags.disableTypeInference], args: args);
   });
 }
 
 /// Compute closure data mapping for [_member] as a [MemberElement].
 ///
 /// Fills [actualMap] with the data and [sourceSpanMap] with the source spans
 /// for the data origin.
 void computeJumpsData(
     Compiler compiler, MemberEntity _member, Map<Id, ActualData> actualMap,
     {bool verbose: false}) {
@@ skipping 123 matching lines @@
   @override
   visitSwitchStatement(ast.SwitchStatement node) {
     JumpTarget target = elements.getTargetDefinition(node);
     if (target != null) {
       NodeId id = computeLoopNodeId(node);
       SourceSpan sourceSpan = computeSourceSpan(node);
       targets[target] = new TargetData(index++, id, sourceSpan, target);
     }
     super.visitSwitchStatement(node);
   }
+
+  @override
+  visitSwitchCase(ast.SwitchCase node) {
+    JumpTarget target = elements.getTargetDefinition(node);
+    if (target != null) {
+      NodeId id = computeSwitchCaseNodeId(node);
+      SourceSpan sourceSpan = computeSourceSpan(node);
+      targets[target] = new TargetData(index++, id, sourceSpan, target);
+    }
+    super.visitSwitchCase(node);
+  }
 }
 
 /// Kernel IR visitor for computing jump data.
 class JumpsIrChecker extends IrDataExtractor with JumpsMixin {
   final KernelToLocalsMap _localsMap;
 
   JumpsIrChecker(Map<Id, ActualData> actualMap, this._localsMap)
       : super(actualMap);
 
   void run(ir.Node root) {
     super.run(root);
     processData();
   }
 
   @override
   String computeNodeValue(ir.Node node) {
     // Node values are computed post-visit in [processData].
     return null;
   }
 
   @override
   String computeMemberValue(ir.Member member) {
     return null;
   }
 
-  void addTargetData(ir.TreeNode node, JumpTarget target) {
+  void addTargetData(ir.TreeNode node, NodeId id, JumpTarget target) {
     if (target != null) {
-      NodeId id = computeLoopNodeId(node);
       SourceSpan sourceSpan = computeSourceSpan(node);
       targets[target] = new TargetData(index++, id, sourceSpan, target);
     }
   }
 
   visitForStatement(ir.ForStatement node) {
-    addTargetData(node, _localsMap.getJumpTargetForFor(node));
+    addTargetData(
+        node, computeLoopNodeId(node), _localsMap.getJumpTargetForFor(node));
     super.visitForStatement(node);
   }
 
   visitForInStatement(ir.ForInStatement node) {
-    addTargetData(node, _localsMap.getJumpTargetForForIn(node));
+    addTargetData(
+        node, computeLoopNodeId(node), _localsMap.getJumpTargetForForIn(node));
     super.visitForInStatement(node);
   }
 
   visitWhileStatement(ir.WhileStatement node) {
-    addTargetData(node, _localsMap.getJumpTargetForWhile(node));
+    addTargetData(
+        node, computeLoopNodeId(node), _localsMap.getJumpTargetForWhile(node));
     super.visitWhileStatement(node);
   }
 
   visitDoStatement(ir.DoStatement node) {
-    addTargetData(node, _localsMap.getJumpTargetForDo(node));
+    addTargetData(
+        node, computeLoopNodeId(node), _localsMap.getJumpTargetForDo(node));
     super.visitDoStatement(node);
   }
 
   visitBreakStatement(ir.BreakStatement node) {
     JumpTarget target = _localsMap.getJumpTargetForBreak(node);
     assert(target != null, 'No target for $node.');
     NodeId id = computeGotoNodeId(node);
     SourceSpan sourceSpan = computeSourceSpan(node);
     gotos.add(new GotoData(id, sourceSpan, target));
     super.visitBreakStatement(node);
   }
 
   visitSwitchStatement(ir.SwitchStatement node) {
-    addTargetData(node, _localsMap.getJumpTargetForSwitch(node));
+    addTargetData(
+        node, computeLoopNodeId(node), _localsMap.getJumpTargetForSwitch(node));
     super.visitSwitchStatement(node);
   }
+
+  visitSwitchCase(ir.SwitchCase node) {
+    addTargetData(node, computeSwitchCaseNodeId(node),
+        _localsMap.getJumpTargetForSwitchCase(node));
+    super.visitSwitchCase(node);
+  }
+
+  visitContinueSwitchStatement(ir.ContinueSwitchStatement node) {
+    JumpTarget target = _localsMap.getJumpTargetForContinueSwitch(node);
+    assert(target != null, 'No target for $node.');
+    NodeId id = computeGotoNodeId(node);
+    SourceSpan sourceSpan = computeSourceSpan(node);
+    gotos.add(new GotoData(id, sourceSpan, target));
+    super.visitContinueSwitchStatement(node);
+  }
 }