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

Unified Diff: pkg/compiler/lib/src/types/map_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/forwarding_type_mask.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/map_type_mask.dart
diff --git a/pkg/compiler/lib/src/types/map_type_mask.dart b/pkg/compiler/lib/src/types/map_type_mask.dart
index 39ed50bf613d5cf13c89023e9ff759dbc3124ace..52fe4a2a7af77ae05fe8abd7b3207754d71b9d95 100644
--- a/pkg/compiler/lib/src/types/map_type_mask.dart
+++ b/pkg/compiler/lib/src/types/map_type_mask.dart
@@ -64,7 +64,7 @@ class MapTypeMask extends ForwardingTypeMask {
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();
@@ -75,7 +75,7 @@ class MapTypeMask extends ForwardingTypeMask {
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.isMap &&
keyType != null &&
« no previous file with comments | « pkg/compiler/lib/src/types/forwarding_type_mask.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