| Index: pkg/compiler/lib/src/ssa/builder.dart
|
| diff --git a/pkg/compiler/lib/src/ssa/builder.dart b/pkg/compiler/lib/src/ssa/builder.dart
|
| index fe78ce20bc88ec77df550bc68dd242b7d74b257c..f5366f20904e3beaf561d75f9aab0b2321a77c64 100644
|
| --- a/pkg/compiler/lib/src/ssa/builder.dart
|
| +++ b/pkg/compiler/lib/src/ssa/builder.dart
|
| @@ -206,10 +206,8 @@ class LocalsHandler {
|
|
|
| LocalsHandler(
|
| this.builder, this.executableContext, InterfaceType instanceType)
|
| - : this.instanceType =
|
| - instanceType == null || instanceType.containsTypeVariables
|
| - ? null
|
| - : instanceType;
|
| + : this.instanceType = instanceType == null ||
|
| + instanceType.containsTypeVariables ? null : instanceType;
|
|
|
| /// Substituted type variables occurring in [type] into the context of
|
| /// [contextClass].
|
| @@ -4472,7 +4470,7 @@ class SsaBuilder extends ast.Visitor
|
| SourceInformation sourceInformation) {
|
| // Until now we only handle these as getters.
|
| invariant(node, deferredLoader.isDeferredLoaderGetter);
|
| - Element loadFunction = compiler.loadLibraryFunction;
|
| + Element loadFunction = helpers.loadLibraryWrapper;
|
| PrefixElement prefixElement = deferredLoader.enclosingElement;
|
| String loadId =
|
| compiler.deferredLoadTask.getImportDeferName(node, prefixElement);
|
| @@ -4937,7 +4935,7 @@ class SsaBuilder extends ast.Visitor
|
| constructor = constructorImplementation.effectiveTarget;
|
|
|
| final bool isSymbolConstructor =
|
| - constructorDeclaration == compiler.symbolConstructor;
|
| + compiler.commonElements.isSymbolConstructor(constructorDeclaration);
|
| final bool isJSArrayTypedConstructor =
|
| constructorDeclaration == helpers.jsArrayTypedConstructor;
|
|
|
| @@ -5170,7 +5168,7 @@ class SsaBuilder extends ast.Visitor
|
| List<HInstruction> inputs = makeStaticArgumentList(
|
| callStructure, node.arguments, function.implementation);
|
|
|
| - if (function == compiler.identicalFunction) {
|
| + if (function == compiler.commonElements.identicalFunction) {
|
| pushWithPosition(
|
| new HIdentity(inputs[0], inputs[1], null, backend.boolType), node);
|
| return;
|
| @@ -5494,7 +5492,8 @@ class SsaBuilder extends ast.Visitor
|
| @override
|
| void bulkHandleNew(ast.NewExpression node, [_]) {
|
| Element element = elements[node.send];
|
| - final bool isSymbolConstructor = element == compiler.symbolConstructor;
|
| + final bool isSymbolConstructor =
|
| + element == compiler.commonElements.symbolConstructor;
|
| if (!Elements.isMalformed(element)) {
|
| ConstructorElement function = element;
|
| element = function.effectiveTarget;
|
| @@ -5670,10 +5669,8 @@ class SsaBuilder extends ast.Visitor
|
| // Native behavior effects here are similar to native/behavior.dart.
|
| // The return type is dynamic if we don't trust js-interop type
|
| // declarations.
|
| - nativeBehavior.typesReturned.add(
|
| - compiler.options.trustJSInteropTypeAnnotations
|
| - ? type
|
| - : const DynamicType());
|
| + nativeBehavior.typesReturned.add(compiler
|
| + .options.trustJSInteropTypeAnnotations ? type : const DynamicType());
|
|
|
| // The allocation effects include the declared type if it is native (which
|
| // includes js interop types).
|
|
|