Chromium Code Reviews| Index: pkg/compiler/lib/src/inferrer/type_graph_nodes.dart |
| diff --git a/pkg/compiler/lib/src/inferrer/type_graph_nodes.dart b/pkg/compiler/lib/src/inferrer/type_graph_nodes.dart |
| index 0c3fb312a670f4297df173fce03273cc477e0db5..aaedae3043588f0a1d5824e68d80f48cd84c18a9 100644 |
| --- a/pkg/compiler/lib/src/inferrer/type_graph_nodes.dart |
| +++ b/pkg/compiler/lib/src/inferrer/type_graph_nodes.dart |
| @@ -496,13 +496,13 @@ class MemberTypeInformation extends ElementTypeInformation |
| ConstructorElement constructor = element; |
| if (constructor.isIntFromEnvironmentConstructor) { |
| giveUp(inferrer); |
| - return compiler.typesTask.intType.nullable(); |
| + return compiler.commonMasks.intType.nullable(); |
| } else if (constructor.isBoolFromEnvironmentConstructor) { |
| giveUp(inferrer); |
| - return compiler.typesTask.boolType.nullable(); |
| + return compiler.commonMasks.boolType.nullable(); |
| } else if (constructor.isStringFromEnvironmentConstructor) { |
| giveUp(inferrer); |
| - return compiler.typesTask.stringType.nullable(); |
| + return compiler.commonMasks.stringType.nullable(); |
| } |
| } |
| return null; |
| @@ -836,7 +836,7 @@ class DynamicCallSiteTypeInformation extends CallSiteTypeInformation { |
| TypeMask receiverType = receiver.type; |
| if (mask != receiverType) { |
| - return receiverType == inferrer.compiler.typesTask.dynamicType |
| + return receiverType == inferrer.compiler.commonMasks.dynamicType |
|
Harry Terkelsen
2016/08/25 23:06:25
can this just be 'inferrer.commonMasks' now?
Siggi Cherem (dart-lang)
2016/08/25 23:19:33
Done.
|
| ? null |
| : receiverType; |
| } else { |
| @@ -1725,12 +1725,12 @@ TypeMask _narrowType(Compiler compiler, TypeMask type, DartType annotation, |
| if (annotation.isObject) return type; |
| TypeMask otherType; |
| if (annotation.isTypedef || annotation.isFunctionType) { |
| - otherType = compiler.typesTask.functionType; |
| + otherType = compiler.commonMasks.functionType; |
| } else if (annotation.isTypeVariable) { |
| // TODO(ngeoffray): Narrow to bound. |
| return type; |
| } else if (annotation.isVoid) { |
| - otherType = compiler.typesTask.nullType; |
| + otherType = compiler.commonMasks.nullType; |
| } else { |
| assert(annotation.isInterfaceType); |
| otherType = new TypeMask.nonNullSubtype(annotation.element, compiler.world); |