Handle switch continue

tests/compiler/dart2js/equivalence/id_equivalence.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 'package:compiler/src/common.dart';
 import 'package:compiler/src/elements/elements.dart';
 import 'package:compiler/src/resolution/access_semantics.dart';
 import 'package:compiler/src/resolution/send_structure.dart';
 import 'package:compiler/src/resolution/tree_elements.dart';
 import 'package:compiler/src/tree/nodes.dart' as ast;
@@ skipping 139 matching lines @@
 
   SourceSpan computeSourceSpan(ast.Node node) {
     return new SourceSpan(resolvedAst.sourceUri,
         node.getBeginToken().charOffset, node.getEndToken().charEnd);
   }
 
   NodeId computeDefaultNodeId(ast.Node node) {
     return new NodeId(node.getBeginToken().charOffset);
   }
 
-  NodeId computeLoopNodeId(ast.Node node) {
-    return new NodeId(node.getBeginToken().charOffset);
-  }
+  NodeId computeLoopNodeId(ast.Node node) => computeDefaultNodeId(node);
 
-  NodeId computeGotoNodeId(ast.Node node) {
-    return new NodeId(node.getBeginToken().charOffset);
+  NodeId computeGotoNodeId(ast.Node node) => computeDefaultNodeId(node);
+
+  NodeId computeSwitchNodeId(ast.SwitchStatement node) =>
+      computeDefaultNodeId(node);
+
+  NodeId computeSwitchCaseNodeId(ast.SwitchCase node) {
+    ast.Node position;
+    for (ast.Node child in node.labelsAndCases) {
+      if (child.asCaseMatch() != null) {
+        ast.CaseMatch caseMatch = child;
+        position = caseMatch.expression;
+        break;
+      }
+    }
+    return computeDefaultNodeId(position);
   }
 
   void run() {
     resolvedAst.node.accept(this);
   }
 
   visitNode(ast.Node node) {
     node.visitChildren(this);
   }
 
@@ skipping 40 matching lines @@
 
   visitLoop(ast.Loop node) {
     computeForNode(node, computeLoopNodeId(node));
     visitNode(node);
   }
 
   visitGotoStatement(ast.GotoStatement node) {
     computeForNode(node, computeGotoNodeId(node));
     visitNode(node);
   }
+
+  visitSwitchStatement(ast.SwitchStatement node) {
+    computeForNode(node, computeSwitchNodeId(node));
+    visitNode(node);
+  }
+
+  visitSwitchCase(ast.SwitchCase node) {
+    ast.Node position;
+    for (ast.Node child in node.labelsAndCases) {
+      if (child.asCaseMatch() != null) {
+        ast.CaseMatch caseMatch = child;
+        position = caseMatch.expression;
+        break;
+      }
+    }
+    computeForNode(node, computeDefaultNodeId(position));

[Siggi Cherem (dart-lang), 2017/08/30 20:17:29]

use computeSwitchCaseNodeId here?

[Johnni Winther, 2017/08/31 11:03:36]

Done.

+    visitNode(node);
+  }
 }
 
 /// Abstract IR visitor for computing data corresponding to a node or element,
 /// and record it with a generic [Id]
 abstract class IrDataExtractor extends ir.Visitor {
   final Map<Id, ActualData> actualMap;
 
   void registerValue(
       SourceSpan sourceSpan, Id id, String value, Object object) {
     if (value != null) {
@@ skipping 42 matching lines @@
         Uri.parse(node.location.file), node.fileOffset, node.fileOffset + 1);
   }
 
   NodeId computeDefaultNodeId(ir.TreeNode node) {
     assert(node.fileOffset != ir.TreeNode.noOffset);
     return new NodeId(node.fileOffset);
   }
 
   NodeId computeLoopNodeId(ir.TreeNode node) => computeDefaultNodeId(node);
   NodeId computeGotoNodeId(ir.TreeNode node) => computeDefaultNodeId(node);
+  NodeId computeSwitchNodeId(ir.SwitchStatement node) =>
+      computeDefaultNodeId(node);
+  NodeId computeSwitchCaseNodeId(ir.SwitchCase node) =>
+      new NodeId(node.expressionOffsets.first);
 
   void run(ir.Node root) {
     root.accept(this);
   }
 
   defaultNode(ir.Node node) {
     node.visitChildren(this);
   }
 
   defaultMember(ir.Member node) {
@@ skipping 48 matching lines @@
 
   visitWhileStatement(ir.WhileStatement node) {
     computeForNode(node, computeLoopNodeId(node));
     super.visitWhileStatement(node);
   }
 
   visitBreakStatement(ir.BreakStatement node) {
     computeForNode(node, computeGotoNodeId(node));
     super.visitBreakStatement(node);
   }
+
+  visitSwitchStatement(ir.SwitchStatement node) {
+    computeForNode(node, computeSwitchNodeId(node));
+    super.visitSwitchStatement(node);
+  }
+
+  visitSwitchCase(ir.SwitchCase node) {
+    computeForNode(node, computeSwitchCaseNodeId(node));
+    super.visitSwitchCase(node);
+  }
+
+  visitContinueSwitchStatement(ir.ContinueSwitchStatement node) {
+    computeForNode(node, computeGotoNodeId(node));
+    super.visitContinueSwitchStatement(node);
+  }
 }