When reordering constructor initializers, use correct types for temp vars.

pkg/front_end/lib/src/fasta/source/diet_listener.dart

 // Copyright (c) 2016, 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 fasta.diet_listener;
 
 import 'package:kernel/ast.dart'
     show AsyncMarker, Class, InterfaceType, Typedef;
 import 'package:kernel/ast.dart';
 
@@ skipping 18 matching lines @@
 
 import '../parser.dart' show MemberKind, Parser, closeBraceTokenFor, optional;
 
 import '../problems.dart' show internalProblem;
 
 import '../type_inference/type_inference_engine.dart' show TypeInferenceEngine;
 
 import '../type_inference/type_inference_listener.dart'
     show TypeInferenceListener;
 
-import '../type_inference/type_inferrer.dart' show TypeInferrerDisabled;
-
 import '../util/link.dart' show Link;
 
 import 'source_library_builder.dart' show SourceLibraryBuilder;
 
 import 'stack_listener.dart' show NullValue, StackListener;
 
 class DietListener extends StackListener {
   final SourceLibraryBuilder library;
 
   final ClassHierarchy hierarchy;
@@ skipping 376 matching lines @@
       [Scope formalParameterScope, TypeInferenceListener listener]) {
     listener ??= new TypeInferenceListener();
     InterfaceType thisType;
     if (builder.isClassMember) {
       // Note: we set thisType regardless of whether we are building a static
       // member, since that provides better error recovery.
       Class cls = builder.parent.target;
       thisType = cls.thisType;
     }
     var typeInferrer = library.disableTypeInference
-        ? new TypeInferrerDisabled()
+        ? typeInferenceEngine.createDisabledTypeInferrer()
         : typeInferenceEngine.createLocalTypeInferrer(uri, listener, thisType);
     return new BodyBuilder(library, builder, memberScope, formalParameterScope,
         hierarchy, coreTypes, currentClass, isInstanceMember, uri, typeInferrer)
       ..constantExpressionRequired = builder.isConstructor && builder.isConst;
   }
 
   void buildFunctionBody(
       Token token, ProcedureBuilder builder, MemberKind kind, Token metadata) {
     Scope typeParameterScope = builder.computeTypeParameterScope(memberScope);
     Scope formalParameterScope =
@@ skipping 214 matching lines @@
       void addAnnotation(Expression annotation)) {
     if (metadata != null) {
       var listener = createListener(builder, memberScope, false);
       var parser = new Parser(listener);
       parser.parseMetadataStar(metadata);
       List<Expression> metadataConstants = listener.finishMetadata();
       metadataConstants.forEach(addAnnotation);
     }
   }
 }