Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(347)

Unified Diff: pkg/compiler/lib/src/types/flat_type_mask.dart

Issue 1224753002: Remove ClassWorld.subclassesOf and ClassWorld.subtypesOf. (Closed) Base URL: https://github.com/dart-lang/sdk.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « pkg/compiler/lib/src/js_backend/runtime_types.dart ('k') | pkg/compiler/lib/src/types/type_mask.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/compiler/lib/src/types/flat_type_mask.dart
diff --git a/pkg/compiler/lib/src/types/flat_type_mask.dart b/pkg/compiler/lib/src/types/flat_type_mask.dart
index 17d0fc5d418852d67711f78d127c047c45816b67..ce19f17c8b24f42beb34871eee0e8be65c26cfc4 100644
--- a/pkg/compiler/lib/src/types/flat_type_mask.dart
+++ b/pkg/compiler/lib/src/types/flat_type_mask.dart
@@ -50,11 +50,11 @@ class FlatTypeMask implements TypeMask {
return new FlatTypeMask.internal(base, flags);
}
if ((flags >> 1) == SUBTYPE) {
- if (!world.hasAnySubtype(base) || world.hasOnlySubclasses(base)) {
+ if (!world.hasAnyStrictSubtype(base) || world.hasOnlySubclasses(base)) {
flags = (flags & 0x1) | (SUBCLASS << 1);
}
}
- if (((flags >> 1) == SUBCLASS) && !world.hasAnySubclass(base)) {
+ if (((flags >> 1) == SUBCLASS) && !world.hasAnyStrictSubclass(base)) {
flags = (flags & 0x1) | (EXACT << 1);
}
Map<ClassElement, TypeMask> cachedMasks =
@@ -631,10 +631,10 @@ class FlatTypeMask implements TypeMask {
Iterable<ClassElement> subclassesToCheck;
if (isSubtype) {
- subclassesToCheck = classWorld.subtypesOf(base);
+ subclassesToCheck = classWorld.strictSubtypesOf(base);
} else {
assert(isSubclass);
- subclassesToCheck = classWorld.subclassesOf(base);
+ subclassesToCheck = classWorld.strictSubclassesOf(base);
}
return subclassesToCheck != null &&
@@ -704,10 +704,10 @@ class FlatTypeMask implements TypeMask {
if (x.isExact) {
return null;
} else if (x.isSubclass) {
- return classWorld.subclassesOf(element);
+ return classWorld.strictSubclassesOf(element);
} else {
assert(x.isSubtype);
- return classWorld.subtypesOf(element);
+ return classWorld.strictSubtypesOf(element);
}
}
}
« no previous file with comments | « pkg/compiler/lib/src/js_backend/runtime_types.dart ('k') | pkg/compiler/lib/src/types/type_mask.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698