| Index: pkg/compiler/lib/src/ssa/kernel_ast_adapter.dart
|
| diff --git a/pkg/compiler/lib/src/ssa/kernel_ast_adapter.dart b/pkg/compiler/lib/src/ssa/kernel_ast_adapter.dart
|
| index f7622969b2f223cf02f1f5e5deef75ca5838f4e0..8638c73d4d90ec0f67061d3f21a4c39995289ea9 100644
|
| --- a/pkg/compiler/lib/src/ssa/kernel_ast_adapter.dart
|
| +++ b/pkg/compiler/lib/src/ssa/kernel_ast_adapter.dart
|
| @@ -423,7 +423,8 @@ class KernelAstAdapter {
|
| TypeMaskFactory.inferredReturnTypeForElement(
|
| _backend.helpers.createRuntimeType, _globalInferenceResults);
|
|
|
| - ir.Class get objectClass => kernel.classes[_compiler.coreClasses.objectClass];
|
| + ir.Class get objectClass =>
|
| + kernel.classes[_compiler.commonElements.objectClass];
|
|
|
| ir.Procedure get currentIsolate =>
|
| kernel.functions[_backend.helpers.currentIsolate];
|
| @@ -479,14 +480,14 @@ class KernelAstAdapter {
|
| ast.Node node = getNodeOrNull(list);
|
| if (node != null) return elements.getType(node);
|
| assertNodeIsSynthetic(list);
|
| - return _compiler.coreTypes.listType(getDartType(list.typeArgument));
|
| + return _compiler.commonElements.listType(getDartType(list.typeArgument));
|
| }
|
|
|
| DartType getDartTypeOfMapLiteral(ir.MapLiteral literal) {
|
| ast.Node node = getNodeOrNull(literal);
|
| if (node != null) return elements.getType(node);
|
| assertNodeIsSynthetic(literal);
|
| - return _compiler.coreTypes
|
| + return _compiler.commonElements
|
| .mapType(getDartType(literal.keyType), getDartType(literal.valueType));
|
| }
|
|
|
| @@ -619,7 +620,7 @@ class KernelAstAdapter {
|
| _typeLookup(resolveAsRaw: true),
|
| CURRENT_ELEMENT_SPANNABLE,
|
| reporter,
|
| - _compiler.coreTypes);
|
| + _compiler.commonElements);
|
| }
|
|
|
| /// Computes the [native.NativeBehavior] for a call to the [JS_BUILTIN] function.
|
| @@ -647,7 +648,7 @@ class KernelAstAdapter {
|
| _typeLookup(resolveAsRaw: true),
|
| CURRENT_ELEMENT_SPANNABLE,
|
| reporter,
|
| - _compiler.coreTypes);
|
| + _compiler.commonElements);
|
| }
|
|
|
| /// Computes the [native.NativeBehavior] for a call to the [JS_EMBEDDED_GLOBAL]
|
| @@ -682,7 +683,7 @@ class KernelAstAdapter {
|
| _typeLookup(resolveAsRaw: true),
|
| CURRENT_ELEMENT_SPANNABLE,
|
| reporter,
|
| - _compiler.coreTypes);
|
| + _compiler.commonElements);
|
| }
|
|
|
| /// Returns `true` is [node] has a `@Native(...)` annotation.
|
|
|