Fix ignore on FutureOr

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 452 matching lines @@
   };
 })()''');
 
 final _ignoreTypeFailure = JS(
     '',
     '''(() => {
   return $_ignoreMemo((actual, type) => {
       // TODO(vsm): Remove this hack ...
       // This is primarily due to the lack of generic methods,
       // but we need to triage all the types.
+    if ($_isFutureOr($type)) {

[Leaf, 2017/03/31 16:21:45]

I think this should just be type, not $type, no?

[vsm, 2017/03/31 16:24:57]

Done.

+      // Ignore if we would ignore either side of union.
+      let typeArg = $getGenericArgs($type)[0];
+      let typeFuture = ${getGenericClass(Future)}(typeArg);
+      return $_ignoreTypeFailure(actual, typeFuture) ||
+        $_ignoreTypeFailure(actual, typeArg);
+    }
+
     if (!!$isSubtype(type, $Iterable) && !!$isSubtype(actual, $Iterable) ||
-        !!$isSubtype(type, $FutureOr) && !!$isSubtype(actual, $Future) ||
+        !!$isSubtype(type, $Future) && !!$isSubtype(actual, $Future) ||
         !!$isSubtype(type, $Map) && !!$isSubtype(actual, $Map) ||
         $isFunctionType(type) && $isFunctionType(actual) ||
         !!$isSubtype(type, $Stream) && !!$isSubtype(actual, $Stream) ||
         !!$isSubtype(type, $StreamSubscription) &&
         !!$isSubtype(actual, $StreamSubscription)) {
       console.warn('Ignoring cast fail from ' + $typeName(actual) +
                    ' to ' + $typeName(type));
       return true;
     }
     return false;
@@ skipping 490 matching lines @@
     name = '+' + name;
   }
   return name;
 }
 
 /// Emulates the implicit "loadLibrary" function provided by a deferred library.
 ///
 /// Libraries are not actually deferred in DDC, so this just returns a future
 /// that completes immediately.
 Future loadLibrary() => new Future.value();