Reifier hookup

Hook the coercion reifier into the JS backend.

The principle observed changes in the output are from the downward type inference eliminating casts.

The coercion reifier changes in this CL in two ways.

The first is a relatively minor change to factor out the instrumented runtime calls.  The reifier is now parameterized by a runtime object.  If present, casts, wraps, and type object creation are delegated to the runtime.  Otherwise the reifier just produces cast objects directly.  The JS codegen always does the latter.

The larger change is an attempt to make the new AST nodes be resolved.  This is principally done for the typedefs produced for casts - we're not using wrapping right now so I've left that for future if we want it.  This is a bit painful - if we continue down this path I think I'll want to factor this out into a ResolvedAstBuilder or somesuch, but for now this seems to be working.

The rest of the changes are just plumbing in the coercion reifier and its dependencies into the js backend.

BUG=
[email protected]

Review URL: https://codereview.chromium.org/1096583002

Author: leafpetersen

lib/runtime/dart/_internal.js

@@ -499,7 +499,7 @@ var _internal;
         super.IterableBase();
       }
       get [core.$iterator]() {
-        return new (ExpandIterator$(S, T))(this[_iterable][core.$iterator], dart.as(this[_f], dart.functionType(core.Iterable$(T), [S])));
+        return new (ExpandIterator$(S, T))(this[_iterable][core.$iterator], dart.as(this[_f], __CastType0));
       }
     }
     return ExpandIterable;
@@ -512,7 +512,7 @@ var _internal;
       ExpandIterator(iterator, f) {
         this[_iterator] = iterator;
         this[_f] = f;
-        this[_currentExpansion] = dart.as(new EmptyIterator(), core.Iterator$(T));
+        this[_currentExpansion] = new (EmptyIterator$(T))();
         this[_current] = null;
       }
       [_nextExpansion]() {}
@@ -614,7 +614,7 @@ var _internal;
         super.IterableBase();
       }
       get [core.$iterator]() {
-        return new (TakeWhileIterator$(E))(this[_iterable][core.$iterator], dart.as(this[_f], dart.functionType(core.bool, [E])));
+        return new (TakeWhileIterator$(E))(this[_iterable][core.$iterator], dart.as(this[_f], __CastType2));
       }
     }
     return TakeWhileIterable;
@@ -725,7 +725,7 @@ var _internal;
         super.IterableBase();
       }
       get [core.$iterator]() {
-        return new (SkipWhileIterator$(E))(this[_iterable][core.$iterator], dart.as(this[_f], dart.functionType(core.bool, [E])));
+        return new (SkipWhileIterator$(E))(this[_iterable][core.$iterator], dart.as(this[_f], __CastType4));
       }
     }
     return SkipWhileIterable;
@@ -763,7 +763,7 @@ var _internal;
         super.IterableBase();
       }
       get [core.$iterator]() {
-        return dart.as(new EmptyIterator(), core.Iterator$(E));
+        return new (EmptyIterator$(E))();
       }
       [core.$forEach](action) {}
       get [core.$isEmpty]() {
@@ -1060,7 +1060,7 @@ var _internal;
         return buffer.toString();
       }
       where(iterable, f) {
-        return new (WhereIterable$(T))(dart.as(iterable, core.Iterable$(T)), dart.as(f, dart.functionType(core.bool, [T])));
+        return new (WhereIterable$(T))(dart.as(iterable, core.Iterable$(T)), dart.as(f, __CastType6));
       }
       static map(iterable, f) {
         return new MappedIterable(iterable, f);
@@ -1251,6 +1251,26 @@ var _internal;
       return new core.StateError("Too few elements");
     }
   }
+  let __CastType0$ = dart.generic(function(S, T) {
+    let __CastType0 = dart.typedef('__CastType0', () => dart.functionType(core.Iterable$(T), [S]));
+    return __CastType0;
+  });
+  let __CastType0 = __CastType0$();
+  let __CastType2$ = dart.generic(function(E) {
+    let __CastType2 = dart.typedef('__CastType2', () => dart.functionType(core.bool, [E]));
+    return __CastType2;
+  });
+  let __CastType2 = __CastType2$();
+  let __CastType4$ = dart.generic(function(E) {
+    let __CastType4 = dart.typedef('__CastType4', () => dart.functionType(core.bool, [E]));
+    return __CastType4;
+  });
+  let __CastType4 = __CastType4$();
+  let __CastType6$ = dart.generic(function(T) {
+    let __CastType6 = dart.typedef('__CastType6', () => dart.functionType(core.bool, [T]));
+    return __CastType6;
+  });
+  let __CastType6 = __CastType6$();
   let FixedLengthListMixin$ = dart.generic(function(E) {
     class FixedLengthListMixin extends core.Object {
       set length(newLength) {

lib/runtime/dart/_isolate_helper.js

@@ -111,7 +111,7 @@ var _isolate_helper;
     }
     serializeMap(x) {
       let serializeTearOff = this.serialize;
-      return new core.List.from(['map', x.keys[core.$map](dart.as(serializeTearOff, dart.functionType(dart.dynamic, [dart.dynamic])))[core.$toList](), x.values[core.$map](dart.as(serializeTearOff, dart.functionType(dart.dynamic, [dart.dynamic])))[core.$toList]()]);
+      return new core.List.from(['map', x.keys[core.$map](dart.as(serializeTearOff, __CastType0))[core.$toList](), x.values[core.$map](dart.as(serializeTearOff, dart.functionType(dart.dynamic, [dart.dynamic])))[core.$toList]()]);
     }
     serializeJSObject(x) {
       if (!!x.constructor && x.constructor !== Object) {
@@ -349,6 +349,7 @@ var _isolate_helper;
       return initializeObject(classId, emptyInstance, fields);
     }
   }
+  let __CastType0 = dart.typedef('__CastType0', () => dart.functionType(dart.dynamic, [dart.dynamic]));
   // Function _callInIsolate: (_IsolateContext, Function) → dynamic
   function _callInIsolate(isolate, func) {
     let result = isolate.eval(func);
@@ -494,9 +495,9 @@ var _isolate_helper;
       this.controlPort = new RawReceivePortImpl[_controlPort]();
       this.pauseCapability = new isolate.Capability();
       this.terminateCapability = new isolate.Capability();
-      this.delayedEvents = dart.as(new core.List.from([]), core.List$(_IsolateEvent));
-      this.pauseTokens = dart.as(new core.Set(), core.Set$(isolate.Capability));
-      this.errorPorts = dart.as(new core.Set(), core.Set$(isolate.SendPort));
+      this.delayedEvents = new core.List$(_IsolateEvent).from([]);
+      this.pauseTokens = new (core.Set$(isolate.Capability))();
+      this.errorPorts = new (core.Set$(isolate.SendPort))();
       this.initialized = false;
       this.isPaused = false;
       this.doneHandlers = null;
@@ -959,9 +960,9 @@ var _isolate_helper;
     }
     static handleSpawnWorkerRequest(msg) {
       let replyPort = dart.dindex(msg, 'replyPort');
-      IsolateNatives.spawn(dart.as(dart.dindex(msg, 'functionName'), core.String), dart.as(dart.dindex(msg, 'uri'), core.String), dart.as(dart.dindex(msg, 'args'), core.List$(core.String)), dart.dindex(msg, 'msg'), false, dart.as(dart.dindex(msg, 'isSpawnUri'), core.bool), dart.as(dart.dindex(msg, 'startPaused'), core.bool)).then(dart.as(msg => {
+      IsolateNatives.spawn(dart.as(dart.dindex(msg, 'functionName'), core.String), dart.as(dart.dindex(msg, 'uri'), core.String), dart.as(dart.dindex(msg, 'args'), core.List$(core.String)), dart.dindex(msg, 'msg'), false, dart.as(dart.dindex(msg, 'isSpawnUri'), core.bool), dart.as(dart.dindex(msg, 'startPaused'), core.bool)).then(msg => {
         dart.dsend(replyPort, 'send', msg);
-      }, dart.functionType(dart.dynamic, [core.List])), {
+      }, {
         onError: errorMessage => {
           dart.dsend(replyPort, 'send', new core.List.from([_SPAWN_FAILED_SIGNAL, errorMessage]));
         }
@@ -1015,7 +1016,7 @@ var _isolate_helper;
         uri = dart.notNull(uri) + ".js";
       }
       let port = new isolate.ReceivePort();
-      let completer = dart.as(new async.Completer(), async.Completer$(core.List));
+      let completer = new (async.Completer$(core.List))();
       port.first.then(msg => {
         if (dart.equals(dart.dindex(msg, 0), _SPAWNED_SIGNAL)) {
           completer.complete(msg);

lib/runtime/dart/_js_helper.js

@@ -102,7 +102,7 @@ var _js_helper;
         return new (_ConstantMapKeyIterable$(K))(this);
       }
       get values() {
-        return new (_internal.MappedIterable$(K, V))(this[_keys], dart.as((key => this[_fetch](key)).bind(this), dart.functionType(V, [K])));
+        return new (_internal.MappedIterable$(K, V))(this[_keys], (key => dart.as(this[_fetch](key), V)).bind(this));
       }
     }
     ConstantStringMap[dart.implements] = () => [_internal.EfficientLength];
@@ -606,7 +606,7 @@ var _js_helper;
       return dart.notNull(this[_match][core.$length]) - 1;
     }
     groups(groups) {
-      let out = dart.as(new core.List.from([]), core.List$(core.String));
+      let out = new core.List$(core.String).from([]);
       for (let i of groups) {
         out[core.$add](this.group(i));
       }
@@ -1740,7 +1740,7 @@ var _js_helper;
     }
     static parseInt(source, radix, handleError) {
       if (handleError == null)
-        handleError = dart.as(Primitives[_throwFormatException], dart.functionType(core.int, [core.String]));
+        handleError = dart.as(Primitives[_throwFormatException], __CastType0);
       checkString(source);
       let match = /^\s*[+-]?((0x[a-f0-9]+)|(\d+)|([a-z0-9]+))\s*$/i.exec(source);
       let digitsIndex = 1;
@@ -1792,7 +1792,7 @@ var _js_helper;
     static parseDouble(source, handleError) {
       checkString(source);
       if (handleError == null)
-        handleError = dart.as(Primitives[_throwFormatException], dart.functionType(core.double, [core.String]));
+        handleError = dart.as(Primitives[_throwFormatException], __CastType2);
       if (!/^\s*[+-]?(?:Infinity|NaN|(?:\.\d+|\d+(?:\.\d*)?)(?:[eE][+-]?\d+)?)\s*$/.test(source)) {
         return handleError(source);
       }
@@ -2279,7 +2279,7 @@ var _js_helper;
       message = message.replace(new RegExp(ESCAPE_REGEXP, 'g'), '\\$&');
       let match = dart.as(message.match(/\\\$[a-zA-Z]+\\\$/g), core.List$(core.String));
       if (match == null)
-        match = dart.as(new core.List.from([]), core.List$(core.String));
+        match = new core.List$(core.String).from([]);
       let arguments$ = match.indexOf('\\$arguments\\$');
       let argumentsExpr = match.indexOf('\\$argumentsExpr\\$');
       let expr = match.indexOf('\\$expr\\$');
@@ -3709,12 +3709,12 @@ var _js_helper;
     let hashesMap = _foreign_helper.JS_EMBEDDED_GLOBAL('', _js_embedded_names.DEFERRED_LIBRARY_HASHES);
     let hashes = dart.as(hashesMap[loadId], core.List$(core.String));
     if (uris == null)
-      return dart.as(new async.Future.value(null), async.Future$(core.Null));
-    let indices = dart.as(new core.List.generate(uris[core.$length], dart.as(i => i, dart.functionType(dart.dynamic, [core.int]))), core.List$(core.int));
+      return new async.Future$(core.Null).value(null);
+    let indices = new core.List$(core.int).generate(uris[core.$length], i => dart.as(i, core.int));
     let isHunkLoaded = _foreign_helper.JS_EMBEDDED_GLOBAL('', _js_embedded_names.IS_HUNK_LOADED);
     let isHunkInitialized = _foreign_helper.JS_EMBEDDED_GLOBAL('', _js_embedded_names.IS_HUNK_INITIALIZED);
     let indicesToLoad = indices[core.$where](i => !isHunkLoaded(hashes[core.$get](i)))[core.$toList]();
-    return dart.as(async.Future.wait(dart.as(indicesToLoad[core.$map](i => _loadHunk(uris[core.$get](i))), core.Iterable$(async.Future))).then(dart.as(_ => {
+    return dart.as(async.Future.wait(dart.as(indicesToLoad[core.$map](i => _loadHunk(uris[core.$get](i))), core.Iterable$(async.Future))).then(_ => {
       let indicesToInitialize = indices[core.$where](i => !isHunkInitialized(hashes[core.$get](i)))[core.$toList]();
       for (let i of indicesToInitialize) {
         let initializer = _foreign_helper.JS_EMBEDDED_GLOBAL('', _js_embedded_names.INITIALIZE_LOADED_HUNK);
@@ -3724,13 +3724,13 @@ var _js_helper;
       if (dart.notNull(updated) && dart.notNull(exports.deferredLoadHook != null)) {
         exports.deferredLoadHook();
       }
-    }, dart.functionType(dart.dynamic, [core.List]))), async.Future$(core.Null));
+    }), async.Future$(core.Null));
   }
   // Function _loadHunk: (String) → Future<Null>
   function _loadHunk(hunkName) {
     let future = exports._loadingLibraries.get(hunkName);
     if (future != null) {
-      return dart.as(future.then(dart.as(_ => null, dart.functionType(dart.dynamic, [core.Null]))), async.Future$(core.Null));
+      return dart.as(future.then(_ => null), async.Future$(core.Null));
     }
     let uri = _isolate_helper.IsolateNatives.thisScript;
     let index = uri.lastIndexOf('/');
@@ -3819,6 +3819,8 @@ var _js_helper;
   function mainHasTooManyParameters() {
     throw new MainError("'main' expects too many parameters.");
   }
+  let __CastType0 = dart.typedef('__CastType0', () => dart.functionType(core.int, [core.String]));
+  let __CastType2 = dart.typedef('__CastType2', () => dart.functionType(core.double, [core.String]));
   // Exports:
   exports.NoSideEffects = NoSideEffects;
   exports.NoThrows = NoThrows;