Support annotations on assignment and postfix operations

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';
@@ skipping 31 matching lines @@
 ///
 /// Fills [actualMap] with the data and [sourceSpanMap] with the source spans
 /// for the data origin.
 void computeKernelJumpsData(
     Compiler compiler, MemberEntity member, Map<Id, ActualData> actualMap,
     {bool verbose: false}) {
   KernelBackendStrategy backendStrategy = compiler.backendStrategy;
   KernelToElementMapForBuilding elementMap = backendStrategy.elementMap;
   GlobalLocalsMap localsMap = backendStrategy.globalLocalsMapForTesting;
   MemberDefinition definition = elementMap.getMemberDefinition(member);
-  new JumpsIrChecker(actualMap, localsMap.getLocalsMap(member))
+  new JumpsIrChecker(
+          compiler.reporter, actualMap, localsMap.getLocalsMap(member))
       .run(definition.node);
 }
 
 class TargetData {
   final int index;
   final NodeId id;
   final SourceSpan sourceSpan;
   final JumpTarget target;
 
   TargetData(this.index, this.id, this.sourceSpan, this.target);
@@ skipping 56 matching lines @@
   JumpsAstComputer(DiagnosticReporter reporter, Map<Id, ActualData> actualMap,
       ResolvedAst resolvedAst)
       : super(reporter, actualMap, resolvedAst);
 
   void run() {
     super.run();
     processData();
   }
 
   @override
-  String computeNodeValue(ast.Node node, [AstElement element]) {
+  String computeNodeValue(Id id, ast.Node node, [AstElement element]) {
     // Node values are computed post-visit in [processData].
     return null;
   }
 
   @override
-  String computeElementValue(AstElement element) {
+  String computeElementValue(Id id, AstElement element) {
     return null;
   }
 
   @override
   visitLoop(ast.Loop node) {
     JumpTarget target = elements.getTargetDefinition(node);
     if (target != null) {
-      NodeId id = computeLoopNodeId(node);
+      NodeId id = createLoopId(node);
       SourceSpan sourceSpan = computeSourceSpan(node);
       targets[target] = new TargetData(index++, id, sourceSpan, target);
     }
     super.visitLoop(node);
   }
 
   @override
   visitGotoStatement(ast.GotoStatement node) {
     JumpTarget target = elements.getTargetOf(node);
     assert(target != null, 'No target for $node.');
-    NodeId id = computeGotoNodeId(node);
+    NodeId id = createGotoId(node);
     SourceSpan sourceSpan = computeSourceSpan(node);
     gotos.add(new GotoData(id, sourceSpan, target));
     super.visitGotoStatement(node);
   }
 
   @override
   visitSwitchStatement(ast.SwitchStatement node) {
     JumpTarget target = elements.getTargetDefinition(node);
     if (target != null) {
-      NodeId id = computeLoopNodeId(node);
+      NodeId id = createLoopId(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);
+      NodeId id = createSwitchCaseId(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);
+  JumpsIrChecker(DiagnosticReporter reporter, Map<Id, ActualData> actualMap,
+      this._localsMap)
+      : super(reporter, actualMap);
 
   void run(ir.Node root) {
     super.run(root);
     processData();
   }
 
   @override
-  String computeNodeValue(ir.Node node) {
+  String computeNodeValue(Id id, ir.Node node) {
     // Node values are computed post-visit in [processData].
     return null;
   }
 
   @override
-  String computeMemberValue(ir.Member member) {
+  String computeMemberValue(Id id, ir.Member member) {
     return null;
   }
 
   void addTargetData(ir.TreeNode node, NodeId id, JumpTarget target) {
     if (target != null) {
       SourceSpan sourceSpan = computeSourceSpan(node);
       targets[target] = new TargetData(index++, id, sourceSpan, target);
     }
   }
 
   visitForStatement(ir.ForStatement node) {
     addTargetData(
-        node, computeLoopNodeId(node), _localsMap.getJumpTargetForFor(node));
+        node, createLoopId(node), _localsMap.getJumpTargetForFor(node));
     super.visitForStatement(node);
   }
 
   visitForInStatement(ir.ForInStatement node) {
     addTargetData(
-        node, computeLoopNodeId(node), _localsMap.getJumpTargetForForIn(node));
+        node, createLoopId(node), _localsMap.getJumpTargetForForIn(node));
     super.visitForInStatement(node);
   }
 
   visitWhileStatement(ir.WhileStatement node) {
     addTargetData(
-        node, computeLoopNodeId(node), _localsMap.getJumpTargetForWhile(node));
+        node, createLoopId(node), _localsMap.getJumpTargetForWhile(node));
     super.visitWhileStatement(node);
   }
 
   visitDoStatement(ir.DoStatement node) {
     addTargetData(
-        node, computeLoopNodeId(node), _localsMap.getJumpTargetForDo(node));
+        node, createLoopId(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);
+    NodeId id = createGotoId(node);
     SourceSpan sourceSpan = computeSourceSpan(node);
     gotos.add(new GotoData(id, sourceSpan, target));
     super.visitBreakStatement(node);
   }
 
   visitSwitchStatement(ir.SwitchStatement node) {
     addTargetData(
-        node, computeLoopNodeId(node), _localsMap.getJumpTargetForSwitch(node));
+        node, createSwitchId(node), _localsMap.getJumpTargetForSwitch(node));
     super.visitSwitchStatement(node);
   }
 
   visitSwitchCase(ir.SwitchCase node) {
-    addTargetData(node, computeSwitchCaseNodeId(node),
+    addTargetData(node, createSwitchCaseId(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);
+    NodeId id = createGotoId(node);
     SourceSpan sourceSpan = computeSourceSpan(node);
     gotos.add(new GotoData(id, sourceSpan, target));
     super.visitContinueSwitchStatement(node);
   }
 }