languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-05 00:13:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

[dartdevc] Map bottom type to Null in legacy libraries

Browse source 
Fix instance checks for types that are internal to the type system.

Fixes: #40610
Change-Id: I0c6c1bb4d64f25a97c53bd64a3940cf3e9f45c88
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/135580
Reviewed-by: Sigmund Cherem <sigmund@google.com>
Commit-Queue: Nicholas Shahan <nshahan@google.com>
This commit is contained in:
Nicholas Shahan 2020-02-14 16:16:07 +00:00 committed by commit-bot@chromium.org
parent c1467ab5d3
commit 29c9658c51
3 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/dev_compiler/lib/src/kernel/compiler.dart
View file

@ -2600,7 +2600,7 @@ class ProgramCompiler extends ComputeOnceConstantVisitor<js_ast.Expression>
@override
js_ast.Expression visitBottomType(BottomType type) =>
_emitNullabilityWrapper(runtimeCall('bottom'), type.nullability);
_emitType(_types.nullType);
@override
js_ast.Expression visitNeverType(NeverType type) =>

16
sdk_nnbd/lib/_internal/js_dev_runtime/private/ddc_runtime/types.dart
View file

@ -366,7 +366,7 @@ class BottomType extends DartType {
toString() => 'bottom';
}
final bottom = never_;
final bottom = unwrapType(Null);
class JSObjectType extends DartType {
toString() => 'NativeJavaScriptObject';
@ -403,7 +403,7 @@ Type wrapType(type, {isNormalized = false}) {
}
var result = isNormalized
? _Type(type)
: (type is LegacyType
: (_isLegacy(type)
? wrapType(type.type)
: _canonicalizeNormalizedTypeObject(type));
JS('', '#[#] = #', type, _typeObject, result);
@ -415,7 +415,7 @@ Type wrapType(type, {isNormalized = false}) {
/// Used for type object identity. Normalization requires us to return a
/// canonicalized version of the input with all legacy wrappers removed.
Type _canonicalizeNormalizedTypeObject(type) {
assert(type is! LegacyType);
assert(!_isLegacy(type));
// We don't call _canonicalizeNormalizedTypeObject recursively but call wrap
// + unwrap to handle legacy types automatically and force caching the
// canonicalized type under the _typeObject cache property directly. This
@ -424,10 +424,10 @@ Type _canonicalizeNormalizedTypeObject(type) {
Object normalizeHelper(a) => unwrapType(wrapType(a));
// GenericFunctionTypeIdentifiers are implicitly normalized.
if (type is GenericFunctionTypeIdentifier) {
if (JS<bool>('!', '# instanceof #', type, GenericFunctionTypeIdentifier)) {
return wrapType(type, isNormalized: true);
}
if (type is FunctionType) {
if (JS<bool>('!', '# instanceof #', type, FunctionType)) {
var normReturnType = normalizeHelper(type.returnType);
var normArgs = type.args.map(normalizeHelper).toList();
if (JS<bool>('!', '#.Object.keys(#).length === 0', global_, type.named) &&
@ -449,7 +449,7 @@ Type _canonicalizeNormalizedTypeObject(type) {
fnType(normReturnType, normArgs, normNamed, normRequiredNamed);
return wrapType(normType, isNormalized: true);
}
if (type is GenericFunctionType) {
if (JS<bool>('!', '# instanceof #', type, GenericFunctionType)) {
var formals = _getCanonicalTypeFormals(type.typeFormals.length);
var normBounds =
type.instantiateTypeBounds(formals).map(normalizeHelper).toList();
@ -1187,8 +1187,8 @@ bool isSubtypeOf(Object t1, Object t2) {
final _subtypeCache = JS('', 'Symbol("_subtypeCache")');
@notNull
bool _isBottom(type, strictMode) =>
JS('!', '# == # || (!# && #)', type, bottom, strictMode, _isNullType(type));
bool _isBottom(type, strictMode) => JS(
'!', '# === # || (!# && # === #)', type, never_, strictMode, type, bottom);
// TODO(nshahan): Add support for strict/weak mode.
@notNull

3
tests/compiler/dartdevc_native/runtime_utils_nnbd.dart
View file

@ -18,7 +18,8 @@ final neverType = dart.wrapType(dart.never_);
/// them by design.
/// Generic functions are also unchanged, as they have a separate runtime type object representation.
Object unwrap(Type t) {
if (t is dart.LegacyType || t is dart.GenericFunctionType) {
if (JS<bool>('!', '# instanceof #', t, dart.LegacyType) ||
JS<bool>('!', '# instanceof #', t, dart.GenericFunctionType)) {
return t;
}
return dart.unwrapType(t);