Change the type inference for fields in dart2js

lib/compiler/implementation/compiler.dart

 // 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.
 
 
 /**
  * If true, print a warning for each method that was resolved, but not
  * compiled.
  */
 const bool REPORT_EXCESS_RESOLUTION = false;
 
 /**
- * If true, trace information on pass2 optimizations.
- */
-const bool REPORT_PASS2_OPTIMIZATIONS = false;
-
-/**
  * If true, dump the inferred types after compilation.
  */
 const bool DUMP_INFERRED_TYPES = false;
 
 /**
  * A string to identify the revision or build.
  *
  * This ID is displayed if the compiler crashes and in verbose mode, and is
  * an aid in reproducing bug reports.
  *
@@ skipping 147 matching lines @@
   static const SourceString START_ROOT_ISOLATE =
       const SourceString('startRootIsolate');
   bool enabledNoSuchMethod = false;
   bool enabledRuntimeType = false;
 
   Stopwatch progress;
 
   static const int PHASE_SCANNING = 0;
   static const int PHASE_RESOLVING = 1;
   static const int PHASE_COMPILING = 2;
-  static const int PHASE_RECOMPILING = 3;
   int phase;
 
   bool compilationFailed = false;
 
   bool hasCrashed = false;
 
   Compiler([this.tracer = const Tracer(),
             this.enableTypeAssertions = false,
             this.enableUserAssertions = false,
             this.enableMinification = false,
@@ skipping 373 matching lines @@
     log('Inferring types...');
     typesTask.onResolutionComplete();
 
     // TODO(ahe): Remove this line. Eventually, enqueuer.resolution
     // should know this.
     world.populate();
 
     log('Compiling...');
     phase = PHASE_COMPILING;
     processQueue(enqueuer.codegen, main);
-    log("Recompiling ${enqueuer.codegen.recompilationCandidates.length} "
-        "methods...");
-    phase = PHASE_RECOMPILING;
-    processRecompilationQueue(enqueuer.codegen);
     log('Compiled ${codegenWorld.generatedCode.length} methods.');
 
     if (compilationFailed) return;
 
     backend.assembleProgram();
 
     checkQueues();
   }
 
   void processQueue(Enqueuer world, Element main) {
     backend.processNativeClasses(world, libraries.getValues());
     world.addToWorkList(main);
     progress.reset();
     world.forEach((WorkItem work) {
       withCurrentElement(work.element, () => work.run(this, world));
     });
     world.queueIsClosed = true;
     if (compilationFailed) return;
     assert(world.checkNoEnqueuedInvokedInstanceMethods());
     if (DUMP_INFERRED_TYPES && phase == PHASE_COMPILING) {
       print("Inferred argument types:");
       print("------------------------");
       backend.argumentTypes.dump();
       print("");
       print("Inferred return types:");
       print("----------------------");
       backend.dumpReturnTypes();
+      print("");
+      print("Inferred field types:");
+      print("------------------------");
+      backend.fieldTypes.dump();
+      print("");
     }
   }
 
-  void processRecompilationQueue(Enqueuer world) {
-    assert(phase == PHASE_RECOMPILING);
-    while (!world.recompilationCandidates.isEmpty()) {
-      WorkItem work = world.recompilationCandidates.next();
-      Element element = work.element;
-      CodeBuffer oldCode = world.universe.generatedCode[element];
-      world.universe.generatedCode.remove(element);
-      world.universe.generatedBailoutCode.remove(element);
-      withCurrentElement(element, () => work.run(this, world));
-      CodeBuffer newCode = world.universe.generatedCode[element];
-      if (REPORT_PASS2_OPTIMIZATIONS && newCode != oldCode) {
-        log("Pass 2 optimization:");
-        log("Before:\n$oldCode");
-        log("After:\n$newCode");
-      }
-    }
-  }
-
   /**
    * Perform various checks of the queues. This includes checking that
    * the queues are empty (nothing was added after we stopped
    * processing the queues). Also compute the number of methods that
    * were resolved, but not compiled (aka excess resolution).
    */
   checkQueues() {
     for (Enqueuer world in [enqueuer.resolution, enqueuer.codegen]) {
       world.forEach((WorkItem work) {
         internalErrorOnElement(work.element, "Work list is not empty.");
@@ skipping 83 matching lines @@
     assert(invariant(element, element.isDeclaration));
     enqueuer.resolution.resolvedElements[element] = result;
     return result;
   }
 
   void codegen(WorkItem work, Enqueuer world) {
     if (world !== enqueuer.codegen) return null;
     if (progress.elapsedInMs() > 500) {
       // TODO(ahe): Add structured diagnostics to the compiler API and
       // use it to separate this from the --verbose option.
-      if (phase == PHASE_COMPILING) {
-        log('Compiled ${codegenWorld.generatedCode.length} methods.');
-      } else {
-        log('Recompiled ${world.recompilationCandidates.processed} methods.');
-      }
+      log('Compiled ${codegenWorld.generatedCode.length} methods.');
       progress.reset();
     }
     backend.codegen(work);
   }
 
   DartType resolveTypeAnnotation(Element element,
                                  TypeAnnotation annotation) {
     return resolver.resolveTypeAnnotation(element, annotation);
   }
 
@@ skipping 224 matching lines @@
  * information in the generated error message.
  */
 bool invariant(Spannable spannable, var condition, {String message: null}) {
   // TODO(johnniwinther): Use [spannable] and [message] to provide better
   // information on assertion errors.
   if (condition is Function){
     condition = condition();
   }
   return spannable != null && condition;
 }