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

Unified Diff: pkg/compiler/lib/src/inferrer/type_graph_inferrer.dart

Issue 2595493002: Merge CoreTypes and CoreClasses into CommonElements. (Closed)
Patch Set: Updated cf. comment Created 4 years 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
Index: pkg/compiler/lib/src/inferrer/type_graph_inferrer.dart
diff --git a/pkg/compiler/lib/src/inferrer/type_graph_inferrer.dart b/pkg/compiler/lib/src/inferrer/type_graph_inferrer.dart
index 332e256ac1617105bce0c7a84c9ea5b13b2771cf..3b7884e8e44a0906f937ba1d3171ecfe0117bb4b 100644
--- a/pkg/compiler/lib/src/inferrer/type_graph_inferrer.dart
+++ b/pkg/compiler/lib/src/inferrer/type_graph_inferrer.dart
@@ -273,7 +273,7 @@ class TypeInformationSystem extends TypeSystem<TypeInformation> {
{bool isNullable: true}) {
if (annotation.treatAsDynamic) return type;
if (annotation.isVoid) return nullType;
- if (annotation.element == closedWorld.coreClasses.objectClass &&
+ if (annotation.element == closedWorld.commonElements.objectClass &&
isNullable) {
return type;
}
@@ -285,7 +285,7 @@ class TypeInformationSystem extends TypeSystem<TypeInformation> {
return type;
} else {
assert(annotation.isInterfaceType);
- otherType = annotation.element == closedWorld.coreClasses.objectClass
+ otherType = annotation.element == closedWorld.commonElements.objectClass
? dynamicType.type.nonNullable()
: new TypeMask.nonNullSubtype(annotation.element, closedWorld);
}
« no previous file with comments | « pkg/compiler/lib/src/inferrer/simple_types_inferrer.dart ('k') | pkg/compiler/lib/src/js_backend/backend.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698