Issue 5987. Report error if static const references instance const.

compiler/java/com/google/dart/compiler/resolver/CompileTimeConstantAnalyzer.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.collect.Maps;
 import com.google.common.collect.Sets;
 import com.google.dart.compiler.DartCompilationError;
 import com.google.dart.compiler.DartCompilationPhase;
@@ skipping 50 matching lines @@
  * each expression matches all the rules for a compile-time constant. Emits a
  * resolution error if not.
  *
  * This script doesn't just resolve expressions, it also sets types to the
  * extent needed to validate compile-time constant expressions (boolean, int,
  * double, and string types might be set)
  */
 public class CompileTimeConstantAnalyzer {
 
   private class ExpressionVisitor extends ASTVisitor<Void> {
-    private ExpressionVisitor() {
+    private final boolean shouldBeStatic;
+
+    private ExpressionVisitor(boolean shouldBeStatic) {
+      this.shouldBeStatic = shouldBeStatic;
     }
 
     private boolean checkBoolean(DartNode x, Type type) {
       // Spec 0.11 allows using "null" literal in place of bool.
       if (x instanceof DartNullLiteral) {
         return true;
       }
       // check actual type
       if (!type.equals(boolType)) {
         context.onError(new DartCompilationError(x,
@@ skipping 278 matching lines @@
     @Override
     public Void visitIdentifier(DartIdentifier x) {
       x.visitChildren(this);
 
       if (x.getParent() instanceof DartDeclaration<?>
           && ((DartDeclaration<?>) x.getParent()).getName() == x) {
         return null;
       }
 
       Element element = x.getElement();
+      boolean elementIsStatic = element != null
+          && (element.getModifiers().isStatic() || Elements.isTopLevel(element));
       switch (ElementKind.of(element)) {
         case CLASS:
         case PARAMETER:
         case LIBRARY_PREFIX:
           break;
 
         case FIELD:
           FieldElement fieldElement = (FieldElement) element;
 
+          if (shouldBeStatic && !elementIsStatic) {
+            context.onError(new DartCompilationError(x, ResolverErrorCode.NOT_A_STATIC_FIELD,
+                fieldElement.getName()));
+          }
+
           // Check for circular references.
           if (element != null && visitedElements.contains(element)) {
             context.onError(new DartCompilationError(x, ResolverErrorCode.CIRCULAR_REFERENCE));
             rememberInferredType(x, getMostSpecificType(x));
             return null;
           }
           visitedElements.add(element);
 
           // Should be declared as constant.
           if (!element.getModifiers().isConstant()) {
@@ skipping 21 matching lines @@
           rememberInferredType(x, inferredType);
           break;
           
         case VARIABLE:
           if (!element.getModifiers().isConstant()) {
             expectedConstant(x);
           }
           return null;
 
         case METHOD:
-          if (!element.getModifiers().isStatic() && !Elements.isTopLevel(element)) {
+          if (!elementIsStatic) {
             expectedConstant(x);
           }
           return null;
 
         case NONE:
         default:
           expectedConstant(x);
           return null;
       }
       return null;
@@ skipping 190 matching lines @@
         }
         return null;
       }
       return super.visitArrayLiteral(node);
     }
 
     @Override
     public Void visitField(DartField node) {
       if (node.getParent() != null) {
         if (node.getModifiers().isConstant()) {
-          Type type = checkConstantExpression(node.getValue());
+          Type type = checkConstantExpression(node.getValue(), node.getModifiers().isStatic());
           if (node.getElement().getType().equals(dynamicType)) {
             node.getElement().setConstantType(type);
           }
           return null;
         }
       }
       return super.visitField(node);
     }
 
     @Override
@@ skipping 138 matching lines @@
     this.context = context;
     this.boolType = typeProvider.getBoolType();
     this.doubleType = typeProvider.getDoubleType();
     this.intType = typeProvider.getIntType();
     this.numType = typeProvider.getNumType();
     this.stringType = typeProvider.getStringType();
     this.dynamicType = typeProvider.getDynamicType();
   }
 
   private Type checkConstantExpression(DartExpression expression) {
+    return checkConstantExpression(expression, false);
+  }
+  
+  private Type checkConstantExpression(DartExpression expression, boolean shouldBeStatic) {
     if (expression != null) {
-      ExpressionVisitor visitor = new ExpressionVisitor();
+      ExpressionVisitor visitor = new ExpressionVisitor(shouldBeStatic);
       expression.accept(visitor);
       return visitor.getMostSpecificType(expression);
     }
     return null;
   }
 
   public void exec(DartUnit unit) {
     unit.accept(new FindCompileTimeConstantExpressionsVisitor());
   }
 }