Index: pkg/dev_compiler/lib/js/amd/dart_sdk.js |
diff --git a/pkg/dev_compiler/lib/js/amd/dart_sdk.js b/pkg/dev_compiler/lib/js/amd/dart_sdk.js |
index 96d9432b942cb2e0a5cb535423ab931d70f0c9b5..79e08ee4cab80ddece9e1e61166eee6a49e66830 100644 |
--- a/pkg/dev_compiler/lib/js/amd/dart_sdk.js |
+++ b/pkg/dev_compiler/lib/js/amd/dart_sdk.js |
@@ -1714,10 +1714,7 @@ define([], function() { |
return null; |
} |
} |
- if (ret2 === dart.void) return true; |
- if (ret1 === dart.void) { |
- return ret2 === dart.dynamic || ret2 === async.FutureOr; |
- } |
+ if (ret1 === dart.void) return dart._isTop(ret2); |
if (!dart._isSubtype(ret1, ret2, isCovariant)) return null; |
return true; |
}; |
@@ -1738,13 +1735,13 @@ define([], function() { |
}; |
}; |
dart._isBottom = function(type) { |
- return type == dart.bottom; |
+ return type == dart.bottom || type == core.Null; |
}; |
dart._isTop = function(type) { |
if (dart.getGenericClass(type) === dart.getGenericClass(async.FutureOr)) { |
return dart._isTop(dart.getGenericArgs(type)[0]); |
} |
- return type == core.Object || type == dart.dynamic; |
+ return type == core.Object || type == dart.dynamic || type == dart.void; |
}; |
dart._isSubtype = function(t1, t2, isCovariant) { |
if (t1 === t2) return true; |
@@ -2223,6 +2220,9 @@ define([], function() { |
return false; |
}; |
dart.is = function(obj, type) { |
+ if (obj == null) { |
+ return type == core.Null || dart._isTop(type); |
+ } |
let result = dart.strongInstanceOf(obj, type); |
if (result !== null) return result; |
let actual = dart.getReifiedType(obj); |