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

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

Issue 1755823003: Replace TypeMask.isEmpty by isEmptyOrNull, use isEmpty when it's really empty. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 4 years, 10 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/container_type_mask.dart ('k') | pkg/compiler/lib/src/types/flat_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/dictionary_type_mask.dart
diff --git a/pkg/compiler/lib/src/types/dictionary_type_mask.dart b/pkg/compiler/lib/src/types/dictionary_type_mask.dart
index 27419779d58396fd34e9d5f4e5520016c7c2dde6..cba828f7ad852bc692c1b2c02075cf889bd4a8da 100644
--- a/pkg/compiler/lib/src/types/dictionary_type_mask.dart
+++ b/pkg/compiler/lib/src/types/dictionary_type_mask.dart
@@ -59,7 +59,7 @@ class DictionaryTypeMask extends MapTypeMask {
TypeMask intersection(TypeMask other, ClassWorld classWorld) {
TypeMask forwardIntersection = forwardTo.intersection(other, classWorld);
- if (forwardIntersection.isEmpty) return forwardIntersection;
+ if (forwardIntersection.isEmptyOrNull) return forwardIntersection;
return forwardIntersection.isNullable
? nullable()
: nonNullable();
@@ -70,7 +70,7 @@ class DictionaryTypeMask extends MapTypeMask {
return this;
} else if (equalsDisregardNull(other)) {
return other.isNullable ? other : this;
- } else if (other.isEmpty) {
+ } else if (other.isEmptyOrNull) {
return other.isNullable ? this.nullable() : this;
} else if (other.isDictionary) {
TypeMask newForwardTo = forwardTo.union(other.forwardTo, classWorld);
@@ -115,4 +115,4 @@ class DictionaryTypeMask extends MapTypeMask {
return
'Dictionary mask: [$keyType/$valueType with $typeMap] type: $forwardTo';
}
-}
+}
« no previous file with comments | « pkg/compiler/lib/src/types/container_type_mask.dart ('k') | pkg/compiler/lib/src/types/flat_type_mask.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698