Fix missed merge conflict for merge request https://github.com/dart-lang/sdk/issues/24782

pkg/compiler/lib/src/js_emitter/program_builder/program_builder.dart

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library dart2js.js_emitter.program_builder;
 
 import '../js_emitter.dart' show
     ClassStubGenerator,
     CodeEmitterTask,
     computeMixinClass,
@@ skipping 405 matching lines @@
               FunctionElement fn = member;
               functionType = fn.type;
             } else if (member.isGetter) {
               if (_compiler.trustTypeAnnotations) {
                 GetterElement getter = member;
                 DartType returnType = getter.type.returnType;
                 if (returnType.isFunctionType) {
                   functionType = returnType;
                 } else if (returnType.treatAsDynamic ||
                     _compiler.types.isSubtype(returnType,
-                        backend.coreTypes.functionType)) {
+                        backend.resolution.coreTypes.functionType)) {
                   if (returnType.isTypedef) {
                     TypedefType typedef = returnType;
                     // TODO(jacobr): can we just use typdef.unaliased instead?
                     functionType = typedef.element.functionSignature.type;
                   } else {
                     // Other misc function type such as coreTypes.Function.
                     // Allow any number of arguments.
                     isFunctionLike = true;
                   }
                 }
@@ skipping 574 matching lines @@
       Constant constant = new Constant(name, holder, constantValue);
       _constants[constantValue] = constant;
     }
   }
 
   Holder _registerStaticStateHolder() {
     return _registry.registerHolder(
         namer.staticStateHolder, isStaticStateHolder: true);
   }
 }