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

Unified Diff: pkg/compiler/lib/src/types/union_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/types/type_mask.dart ('k') | pkg/compiler/lib/src/universe/function_set.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/compiler/lib/src/types/union_type_mask.dart
diff --git a/pkg/compiler/lib/src/types/union_type_mask.dart b/pkg/compiler/lib/src/types/union_type_mask.dart
index f4c45e7148ce34053d6b087e9509838018dc0ea5..63a421df9e7d16d6293dda17629b46b519bab1dc 100644
--- a/pkg/compiler/lib/src/types/union_type_mask.dart
+++ b/pkg/compiler/lib/src/types/union_type_mask.dart
@@ -103,7 +103,7 @@ class UnionTypeMask implements TypeMask {
int bestSize;
for (ClassElement candidate in candidates) {
Iterable<ClassElement> subclasses = useSubclass
- ? classWorld.subclassesOf(candidate)
+ ? classWorld.strictSubclassesOf(candidate)
: const <ClassElement>[];
int size;
int kind;
@@ -114,10 +114,10 @@ class UnionTypeMask implements TypeMask {
// subtype type mask.
kind = FlatTypeMask.SUBCLASS;
size = subclasses.length;
- assert(size <= classWorld.subtypesOf(candidate).length);
+ assert(size <= classWorld.strictSubtypesOf(candidate).length);
} else {
kind = FlatTypeMask.SUBTYPE;
- size = classWorld.subtypesOf(candidate).length;
+ size = classWorld.strictSubtypesOf(candidate).length;
}
// Update the best candidate if the new one is better.
if (bestElement == null || size < bestSize) {
@@ -212,10 +212,10 @@ class UnionTypeMask implements TypeMask {
// Check for other members.
Iterable<ClassElement> members;
if (flat.isSubclass) {
- members = classWorld.subclassesOf(flat.base);
+ members = classWorld.strictSubclassesOf(flat.base);
} else {
assert(flat.isSubtype);
- members = classWorld.subtypesOf(flat.base);
+ members = classWorld.strictSubtypesOf(flat.base);
}
return members.every((ClassElement cls) => this.contains(cls, classWorld));
}
« no previous file with comments | « pkg/compiler/lib/src/types/type_mask.dart ('k') | pkg/compiler/lib/src/universe/function_set.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698