Chromium Code Reviews| Index: pkg/compiler/lib/src/js_backend/backend.dart |
| diff --git a/pkg/compiler/lib/src/js_backend/backend.dart b/pkg/compiler/lib/src/js_backend/backend.dart |
| index 5b9b6bd5697bbce1168110936430ad3a48ee39a1..6bb4c4e5c498fabede4f95ea6cc0b207812a48d8 100644 |
| --- a/pkg/compiler/lib/src/js_backend/backend.dart |
| +++ b/pkg/compiler/lib/src/js_backend/backend.dart |
| @@ -333,16 +333,16 @@ class JavaScriptBackend extends Backend { |
| TRACE_METHOD == 'post' || TRACE_METHOD == 'console'; |
| Element traceHelper; |
| - TypeMask get stringType => compiler.typesTask.stringType; |
| - TypeMask get doubleType => compiler.typesTask.doubleType; |
| - TypeMask get intType => compiler.typesTask.intType; |
| - TypeMask get uint32Type => compiler.typesTask.uint32Type; |
| - TypeMask get uint31Type => compiler.typesTask.uint31Type; |
| - TypeMask get positiveIntType => compiler.typesTask.positiveIntType; |
| - TypeMask get numType => compiler.typesTask.numType; |
| - TypeMask get boolType => compiler.typesTask.boolType; |
| - TypeMask get dynamicType => compiler.typesTask.dynamicType; |
| - TypeMask get nullType => compiler.typesTask.nullType; |
| + TypeMask get stringType => compiler.commonMasks.stringType; |
| + TypeMask get doubleType => compiler.commonMasks.doubleType; |
| + TypeMask get intType => compiler.commonMasks.intType; |
| + TypeMask get uint32Type => compiler.commonMasks.uint32Type; |
| + TypeMask get uint31Type => compiler.commonMasks.uint31Type; |
| + TypeMask get positiveIntType => compiler.commonMasks.positiveIntType; |
| + TypeMask get numType => compiler.commonMasks.numType; |
| + TypeMask get boolType => compiler.commonMasks.boolType; |
| + TypeMask get dynamicType => compiler.commonMasks.dynamicType; |
| + TypeMask get nullType => compiler.commonMasks.nullType; |
| TypeMask get emptyType => const TypeMask.nonNullEmpty(); |
| TypeMask _indexablePrimitiveTypeCache; |
| @@ -402,7 +402,7 @@ class JavaScriptBackend extends Backend { |
| TypeMask _nonNullTypeCache; |
| TypeMask get nonNullType { |
| if (_nonNullTypeCache == null) { |
| - _nonNullTypeCache = compiler.typesTask.dynamicType.nonNullable(); |
| + _nonNullTypeCache = compiler.commonMasks.dynamicType.nonNullable(); |
|
Harry Terkelsen
2016/08/25 23:06:25
just replace compiler.commonMasks.dynamicType with
Siggi Cherem (dart-lang)
2016/08/25 23:19:33
Actually - nonNullType is defined in commonMasks a
|
| } |
| return _nonNullTypeCache; |
| } |
| @@ -626,8 +626,8 @@ class JavaScriptBackend extends Backend { |
| constantCompilerTask = new JavaScriptConstantTask(compiler); |
| impactTransformer = new JavaScriptImpactTransformer(this); |
| patchResolverTask = new PatchResolverTask(compiler); |
| - functionCompiler = new SsaFunctionCompiler( |
| - this, sourceInformationStrategy, useKernel); |
| + functionCompiler = |
| + new SsaFunctionCompiler(this, sourceInformationStrategy, useKernel); |
| serialization = new JavaScriptBackendSerialization(this); |
| } |