Issue 4543. Use complete Resolver before constants analyzer

compiler/java/com/google/dart/compiler/DartCompiler.java

Index: compiler/java/com/google/dart/compiler/DartCompiler.java
diff --git a/compiler/java/com/google/dart/compiler/DartCompiler.java b/compiler/java/com/google/dart/compiler/DartCompiler.java
index 6560536484bd85e079188959752236de3e1ea4f1..ee98d2b83236dbb249b02dd2541154a8c2f70169 100644
--- a/compiler/java/com/google/dart/compiler/DartCompiler.java
+++ b/compiler/java/com/google/dart/compiler/DartCompiler.java
@@ -29,7 +29,6 @@ import com.google.dart.compiler.metrics.Tracer;
 import com.google.dart.compiler.metrics.Tracer.TraceEvent;
 import com.google.dart.compiler.parser.DartParser;
 import com.google.dart.compiler.resolver.CompileTimeConstantAnalyzer;
-import com.google.dart.compiler.resolver.CompileTimeConstantResolver;
 import com.google.dart.compiler.resolver.CoreTypeProvider;
 import com.google.dart.compiler.resolver.CoreTypeProviderImplementation;
 import com.google.dart.compiler.resolver.Element;
@@ -605,12 +604,6 @@ public class DartCompiler {
           }
         }
 
-        // Perform resolution on compile-time constant expressions.
-        for (LibraryUnit lib : getLibrariesToProcess()) {
-          for (DartUnit unit : lib.getUnits()) {
-            new CompileTimeConstantResolver().exec(unit, context, getTypeProvider());
-          }
-        }
       } finally {
         Tracer.end(logEvent);
       }
@@ -1277,8 +1270,8 @@ public class DartCompiler {
     librariesToResolve.put(topLibUnit.getSource().getUri(), topLibUnit);
     
     DartCompilationPhase[] phases = {
-        new CompileTimeConstantAnalyzer.Phase(),
         new Resolver.Phase(),
+        new CompileTimeConstantAnalyzer.Phase(),
         new TypeAnalyzer()};
     Map<URI, LibraryUnit> newLibraries = Maps.newHashMap();
     for (Entry<URI, LibraryUnit> entry : librariesToResolve.entrySet()) {