Update web_command code so that it continues to use the legacy module loader. Drive by removal of m…

pkg/dev_compiler/tool/input_sdk/private/ddc_runtime/operations.dart

 // Copyright (c) 2015, 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.
 
 /// This library defines runtime operations on objects used by the code
 /// generator.
 part of dart._runtime;
 
 class InvocationImpl extends Invocation {
   final Symbol memberName;
@@ skipping 15 matching lines @@
     if (namedArgs == null) return {};
     return new Map.fromIterable(
         getOwnPropertyNames(namedArgs),
         key: _dartSymbol,
         value: (k) => JS('', '#[#]', namedArgs, k));
   }
 }
 
 dload(obj, field) {
   var f = _canonicalMember(obj, field);
-  _trackCall(obj, f);
+  _trackCall(obj);
   if (f != null) {
     if (hasMethod(obj, f)) return bind(obj, f, JS('', 'void 0'));
     return JS('', '#[#]', obj, f);
   }
   return noSuchMethod(obj,
       new InvocationImpl(field, JS('', '[]'), isGetter: true));
 }
 
 dput(obj, field, value) {
   var f = _canonicalMember(obj, field);
-  _trackCall(obj, f);
+  _trackCall(obj);
   if (f != null) {
     return JS('', '#[#] = #', obj, f, value);
   }
   return noSuchMethod(obj,
       new InvocationImpl(field, JS('', '[#]', value), isSetter: true));
 }
 
 /// Check that a function of a given type can be applied to
 /// actuals.
 _checkApply(type, actuals) => JS('', '''(() => {
@@ skipping 41 matching lines @@
     var last = JS('', '#[#.length - 1]', args, args);
     if (JS('bool', '# != null && #.__proto__ === Object.prototype',
         last, last)) {
       return JS('', '#.pop()', args);
     }
   }
   return null;
 }
 
 _checkAndCall(f, ftype, obj, typeArgs, args, name) => JS('', '''(() => {
-  $_trackCall($obj, $name);
+  $_trackCall($obj);
 
   let originalTarget = obj === void 0 ? f : obj;
 
   function callNSM() {
     return $noSuchMethod(originalTarget, new $InvocationImpl(
         $name, $args,
         {namedArguments: $extractNamedArgs($args), isMethod: true}));
   }
   if (!($f instanceof Function)) {
     // We're not a function (and hence not a method either)
@@ skipping 55 matching lines @@
   // TODO(jmesserly): nSM should include type args?
   return callNSM();
 })()''');
 
 dcall(f, @rest args) => _checkAndCall(
     f, _getRuntimeType(f), JS('', 'void 0'), null, args, 'call');
 
 dgcall(f, typeArgs, @rest args) => _checkAndCall(
     f, _getRuntimeType(f), JS('', 'void 0'), typeArgs, args, 'call');
 
-Map<String, int> _callMethodStats = new Map();
+class _MethodStats {
+  final String typeName;
+  final String frame;
+  int count;
+
+  _MethodStats(this.typeName, this.frame) {
+    count = 0;
+  }
+}
+
+Map<String, _MethodStats> _callMethodStats = new Map();
 
 List<List<Object>> getDynamicStats() {
   List<List<Object>> ret = [];
 
   var keys = _callMethodStats.keys.toList();
 
-  keys.sort((a, b) => _callMethodStats[b].compareTo(_callMethodStats[a]));
+  keys.sort((a, b) => _callMethodStats[b].count.compareTo(_callMethodStats[a].count));

[Jennifer Messerly, 2016/09/06 16:34:29]

long line

(we sadly can't auto format these files due to the weird JS/Dart hybridization
:|

[Jacob, 2016/09/06 16:37:02]

Done.

   for (var key in keys) {
-    int count = _callMethodStats[key];
-    ret.add([key, count]);
+    var stats = _callMethodStats[key];
+    ret.add([stats.typeName, stats.frame, stats.count]);
   }
 
   return ret;
 }
 
 clearDynamicStats() {
   _callMethodStats.clear();
 }
 
 bool trackProfile = JS('bool', 'dart.global.trackDdcProfile');
 
-_trackCall(obj, name) {
+_trackCall(obj) {
   if (JS('bool', '!#', trackProfile)) return;
 
   var actual = getReifiedType(obj);
   String stackStr = JS('String', "new Error().stack");
   var stack = stackStr.split('\n    at ');
   var src = '';
   for (int i = 2; i < stack.length; ++i) {
     var frame = stack[i];
     if (!frame.contains('dart_sdk.js')) {
       src = frame;
       break;
     }
   }
 
-  name = "${typeName(actual)}.$name <$src>";
-  if (_callMethodStats.containsKey(name)) {
-    _callMethodStats[name] = _callMethodStats[name] + 1;
-  } else {
-    _callMethodStats[name] = 1;
-  }
+  var actualTypeName = typeName(actual);
+  _callMethodStats.putIfAbsent("$actualTypeName <$src>",
+      () => new _MethodStats(actualTypeName, src)).count++;
 }
 
 /// Shared code for dsend, dindex, and dsetindex.
 _callMethod(obj, name, typeArgs, args, displayName) {
   var symbol = _canonicalMember(obj, name);
   if (symbol == null) {
     return noSuchMethod(obj,
         new InvocationImpl(displayName, args, isMethod: true));
   }
   var f = obj != null ? JS('', '#[#]', obj, symbol) : null;
@@ skipping 495 matching lines @@
   if (obj != null && getExtensionType(obj) != null) {
     return JS('', 'dartx.#', name);
   }
 
   // Check for certain names that we can't use in JS
   if (name == 'constructor' || name == 'prototype') {
     name = '+' + name;
   }
   return name;
 }