Fix lingering switch statement test failures.

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

 // Copyright (c) 2016, 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.md file.
 
 import 'package:kernel/ast.dart' as ir;
 import 'package:kernel/frontend/accessors.dart'
     show
         Accessor,
         IndexAccessor,
         NullAwarePropertyAccessor,
@@ skipping 369 matching lines @@
     throw new UnsupportedError("applyInitializers");
   }
 
   @override
   ir.AssertStatement visitAssert(Assert node) {
     return new ir.AssertStatement(
         visitForValue(node.condition), visitForValue(node.message));
   }
 
   ir.LabeledStatement getBreakTarget(JumpTarget target) {
-    return breakTargets.putIfAbsent(
-        target, () => new ir.LabeledStatement(null));
+    return breakTargets.putIfAbsent(target,
+        () => associateNode(new ir.LabeledStatement(null), target.statement));
   }
 
   ir.LabeledStatement getContinueTarget(JumpTarget target) {
-    return continueTargets.putIfAbsent(
-        target, () => new ir.LabeledStatement(null));
+    return continueTargets.putIfAbsent(target,
+        () => associateNode(new ir.LabeledStatement(null), target.statement));
   }
 
   ir.SwitchCase getContinueSwitchTarget(JumpTarget target) {
     return continueSwitchTargets[target];
   }
 
   /// The optional positional parameter isBreakTarget can be added in cases
   /// where a break statement was added but the element model and underlying
   /// JumpTargets don't know about it.
   ir.Statement buildBreakTarget(
@@ skipping 177 matching lines @@
         buildStatement(statement, statements);
       }
     } else {
       if (buildStatement(node, statements)) forceBlock = true;
       if (!forceBlock && statements.length == 1) {
         return statements.single;
       }
       // One VariableDefinitions statement node (dart2js AST) may generate
       // multiple statements in Kernel IR so we sometimes fall through here.
     }
-    return new ir.Block(statements);
+    return associateNode(new ir.Block(statements), node);
   }
 
   @override
   ir.Statement visitBreakStatement(BreakStatement node) {
     JumpTarget target = elements.getTargetOf(node);
     if (target == null || !target.statement.isValidBreakTarget()) {
       // This is a break in an invalid position.
       return new ir.InvalidStatement();
     }
     // A break can break to itself in the degenerate case `label: break
@@ skipping 177 matching lines @@
       updates.add(visitForEffect(update));
     }
 
     JumpTarget jumpTarget = elements.getTargetDefinition(node);
     ir.Statement body =
         buildContinueTarget(buildStatementInBlock(node.body), node, jumpTarget);
     ir.ForStatement forStatement = associateNode(
         new ir.ForStatement(variables, condition, updates, body), node);
     ir.Statement result = buildBreakTarget(forStatement, node, jumpTarget);
     if (initializer != null) {
-      result = new ir.Block(
-          <ir.Statement>[new ir.ExpressionStatement(initializer), result]);
+      result = associateNode(
+          new ir.Block(
+              <ir.Statement>[new ir.ExpressionStatement(initializer), result]),
+          node.initializer);
     }
     return result;
   }
 
   @override
   ir.FunctionDeclaration visitFunctionDeclaration(FunctionDeclaration node) {
     return node.function.accept(this);
   }
 
   @override
@@ skipping 15 matching lines @@
   }
 
   @override
   ir.Statement visitLabeledStatement(LabeledStatement node) {
     Statement statement = node.statement;
     ir.Statement result = (statement is Block)
         // If [statement] is a Block, we need to ensure that we don't bypass
         // its visit method (so it can build break targets correctly).
         ? statement.accept(this)
         : buildStatementInBlock(statement);
+    associateNode(result, statement);
 
     // A [LabeledStatement] isn't the actual jump target, instead, [statement]
     // is the target. This allows uniform handling of break and continue in
     // loops. The following code simply assert that [result] has been generated
     // correctly with respect to jump targets.
     JumpTarget jumpTarget = elements.getTargetDefinition(node.statement);
     if (jumpTarget != null) {
       if (jumpTarget.isBreakTarget) {
         ir.LabeledStatement target = breakTargets[jumpTarget];
         if (target != null && target != result && target.parent == null) {
@@ skipping 153 matching lines @@
         expressions.add(visitForValue(match.expression));
       } else {
         // Assert that labelOrCase is one of two known types: [CaseMatch] or
         // [Label]. We ignore cases, as any users have been resolved to use the
         // case directly.
         assert(labelOrCase.asLabel() != null);
       }
     }
     // We ignore the node's statements here, they're generated below in
     // [visitSwitchStatement] once we've set up all the jump targets.
-    return new ir.SwitchCase(expressions, null, isDefault: node.isDefaultCase);
+    return associateNode(
+        new ir.SwitchCase(expressions, null, isDefault: node.isDefaultCase),
+        node);
   }
 
   /// Returns true if [node] would let execution reach the next node (aka
   /// fall-through in switch cases).
   bool fallsThrough(ir.Statement node) {
     return !(node is ir.BreakStatement ||
         node is ir.ReturnStatement ||
         node is ir.ContinueSwitchStatement ||
         (node is ir.ExpressionStatement && node.expression is ir.Throw));
   }
@@ skipping 1849 matching lines @@
       : this(null, true, node, initializers);
 
   accept(ir.Visitor v) => throw "unsupported";
 
   visitChildren(ir.Visitor v) => throw "unsupported";
 
   String toString() {
     return "IrFunction($kind, $isConstructor, $node, $initializers)";
   }
 }