Regen against latest analyzer

test/codegen/expect/collection/src/canonicalized_map.js

 dart_library.library('collection/src/canonicalized_map', null, /* Imports */[
   'dart/_runtime',
   'dart/core',
   'collection/src/utils',
   'dart/collection'
 ], /* Lazy imports */[
 ], function(exports, dart, core, utils, collection) {
   'use strict';
   let dartx = dart.dartx;
+  const _Canonicalize$ = dart.generic(function(C, K) {
+    const _Canonicalize = dart.typedef('_Canonicalize', () => dart.functionType(C, [K]));
+    return _Canonicalize;
+  });
+  let _Canonicalize = _Canonicalize$();
+  const _IsValidKey = dart.typedef('_IsValidKey', () => dart.functionType(core.bool, [core.Object]));
   const _base = Symbol('_base');
   const _canonicalize = Symbol('_canonicalize');
   const _isValidKeyFn = Symbol('_isValidKeyFn');
   const _isValidKey = Symbol('_isValidKey');
   const CanonicalizedMap$ = dart.generic(function(C, K, V) {
     class CanonicalizedMap extends core.Object {
       CanonicalizedMap(canonicalize, opts) {
         let isValidKey = opts && 'isValidKey' in opts ? opts.isValidKey : null;
         this[_base] = core.Map$(C, utils.Pair$(K, V)).new();
         this[_canonicalize] = canonicalize;
         this[_isValidKeyFn] = isValidKey;
       }
       from(other, canonicalize, opts) {
         let isValidKey = opts && 'isValidKey' in opts ? opts.isValidKey : null;
         this[_base] = core.Map$(C, utils.Pair$(K, V)).new();
         this[_canonicalize] = canonicalize;
         this[_isValidKeyFn] = isValidKey;
         this.addAll(other);
       }
       get(key) {
         if (!dart.notNull(this[_isValidKey](key))) return null;
-        let pair = this[_base][dartx.get](dart.dcall(this[_canonicalize], key));
+        let pair = this[_base][dartx.get](this[_canonicalize](dart.as(key, K)));
         return pair == null ? null : pair.last;
       }
       set(key, value) {
         (() => {
           dart.as(key, K);
           dart.as(value, V);
           if (!dart.notNull(this[_isValidKey](key))) return;
-          this[_base][dartx.set](dart.as(dart.dcall(this[_canonicalize], key), C), new (utils.Pair$(K, V))(key, value));
+          this[_base][dartx.set](this[_canonicalize](key), new (utils.Pair$(K, V))(key, value));
         })();
         return value;
       }
       addAll(other) {
         dart.as(other, core.Map$(K, V));
         other[dartx.forEach](dart.fn((key, value) => {
           dart.as(key, K);
           dart.as(value, V);
           return this.set(key, value);
         }, V, [K, V]));
       }
       clear() {
         this[_base][dartx.clear]();
       }
       containsKey(key) {
         if (!dart.notNull(this[_isValidKey](key))) return false;
-        return this[_base][dartx.containsKey](dart.dcall(this[_canonicalize], key));
+        return this[_base][dartx.containsKey](this[_canonicalize](dart.as(key, K)));
       }
       containsValue(value) {
         return this[_base][dartx.values][dartx.any](dart.fn(pair => {
           dart.as(pair, utils.Pair$(K, V));
           return dart.equals(pair.last, value);
         }, core.bool, [utils.Pair$(K, V)]));
       }
       forEach(f) {
         dart.as(f, dart.functionType(dart.void, [K, V]));
         this[_base][dartx.forEach](dart.fn((key, pair) => {
@@ skipping 13 matching lines @@
           dart.as(pair, utils.Pair$(K, V));
           return pair.first;
         }, K, [utils.Pair$(K, V)]));
       }
       get length() {
         return this[_base][dartx.length];
       }
       putIfAbsent(key, ifAbsent) {
         dart.as(key, K);
         dart.as(ifAbsent, dart.functionType(V, []));
-        return this[_base][dartx.putIfAbsent](dart.as(dart.dcall(this[_canonicalize], key), C), dart.fn(() => new (utils.Pair$(K, V))(key, ifAbsent()), utils.Pair$(K, V), [])).last;
+        return this[_base][dartx.putIfAbsent](this[_canonicalize](key), dart.fn(() => new (utils.Pair$(K, V))(key, ifAbsent()), utils.Pair$(K, V), [])).last;
       }
       remove(key) {
         if (!dart.notNull(this[_isValidKey](key))) return null;
-        let pair = this[_base][dartx.remove](dart.dcall(this[_canonicalize], key));
+        let pair = this[_base][dartx.remove](this[_canonicalize](dart.as(key, K)));
         return pair == null ? null : pair.last;
       }
       get values() {
         return this[_base][dartx.values][dartx.map](dart.fn(pair => {
           dart.as(pair, utils.Pair$(K, V));
           return pair.last;
         }, V, [utils.Pair$(K, V)]));
       }
       toString() {
         return collection.Maps.mapToString(this);
       }
       [_isValidKey](key) {
-        return (key == null || dart.is(key, K)) && (this[_isValidKeyFn] == null || dart.notNull(dart.as(dart.dcall(this[_isValidKeyFn], key), core.bool)));
+        return (key == null || dart.is(key, K)) && (this[_isValidKeyFn] == null || dart.notNull(this[_isValidKeyFn](key)));
       }
     }
     CanonicalizedMap[dart.implements] = () => [core.Map$(K, V)];
     dart.defineNamedConstructor(CanonicalizedMap, 'from');
     dart.setSignature(CanonicalizedMap, {
       constructors: () => ({
         CanonicalizedMap: [CanonicalizedMap$(C, K, V), [dart.functionType(C, [K])], {isValidKey: dart.functionType(core.bool, [core.Object])}],
         from: [CanonicalizedMap$(C, K, V), [core.Map$(K, V), dart.functionType(C, [K])], {isValidKey: dart.functionType(core.bool, [core.Object])}]
       }),
       methods: () => ({
@@ skipping 25 matching lines @@
       'length',
       'values'
     ]);
     return CanonicalizedMap;
   });
   let CanonicalizedMap = CanonicalizedMap$();
   // Exports:
   exports.CanonicalizedMap$ = CanonicalizedMap$;
   exports.CanonicalizedMap = CanonicalizedMap;
 });