Don't infer non-final field types

compiler/java/com/google/dart/compiler/resolver/Resolver.java

 // Copyright (c) 2012, 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.
 
 package com.google.dart.compiler.resolver;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import com.google.dart.compiler.DartCompilationPhase;
@@ skipping 661 matching lines @@
       Modifiers modifiers = node.getModifiers();
       boolean isFinal = modifiers.isFinal();
       boolean isTopLevel = ElementKind.of(currentHolder).equals(ElementKind.LIBRARY);
       boolean isStatic = modifiers.isStatic();
 
       if (expression != null) {
         resolve(expression);
         // Now, this constant has a type. Save it for future reference.
         Element element = node.getElement();
         Type expressionType = expression.getType();
-        if (expressionType != null && TypeKind.of(element.getType()) == TypeKind.DYNAMIC) {
+        if (isFinal && expressionType != null && TypeKind.of(element.getType()) == TypeKind.DYNAMIC) {
           Type fieldType = Types.makeInferred(expressionType);
           Elements.setType(element, fieldType);
         }
       } else if (isFinal) {
         if (modifiers.isConstant()) {
           onError(node, ResolverErrorCode.CONST_REQUIRES_VALUE);
         } else if (isStatic) {
           onError(node, ResolverErrorCode.STATIC_FINAL_REQUIRES_VALUE);
         } else if (isTopLevel) {
           onError(node, ResolverErrorCode.TOPLEVEL_FINAL_REQUIRES_VALUE);
@@ skipping 1511 matching lines @@
           ClassElement currentClass = (ClassElement) constructor.getEnclosingElement();
           if (nextClass == currentClass) {
             return (ConstructorNodeElement) nextConstructorElement;
           }
         }
       }
     }
     return null;
   }
 }