Move types out of the HInstructions.

lib/compiler/implementation/enqueue.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.
 
 class EnqueueTask extends CompilerTask {
   final Enqueuer codegen;
   final Enqueuer resolution;
 
   String get name() => 'Enqueue';
 
   EnqueueTask(Compiler compiler)
-    : codegen = new Enqueuer(compiler),
-      resolution = new Enqueuer(compiler),
+    : codegen = new Enqueuer(compiler, compiler.backend),
+      resolution = new Enqueuer(compiler, compiler.backend),
       super(compiler) {
     codegen.task = this;
     resolution.task = this;
   }
 }
 
 class RecompilationQueue {
+  final Backend backend;
   final Queue<WorkItem> queue;
   final Set<Element> queueElements;
   int processed = 0;
 
-  RecompilationQueue()
+  RecompilationQueue(this.backend)
     : queue = new Queue<WorkItem>(),
       queueElements = new Set<Element>();
 
   void add(Element element, TreeElements elements) {
     if (queueElements.contains(element)) return;
     queueElements.add(element);
-    queue.add(new WorkItem(element, elements));
+    queue.add(backend.createWorkItem(element, elements));
   }
 
   int get length() => queue.length;
 
   bool isEmpty() => queue.isEmpty();
 
   WorkItem next() {
     WorkItem item = queue.removeLast();
     queueElements.remove(item.element);
     processed++;
     return item;
   }
 }
 
 class Enqueuer {
   final Compiler compiler; // TODO(ahe): Remove this dependency.
+  final Backend backend;
   final Map<String, Link<Element>> instanceMembersByName;
   final Set<ClassElement> seenClasses;
   final Universe universe;
   final Queue<WorkItem> queue;
   final Map<Element, TreeElements> resolvedElements;
   final RecompilationQueue recompilationCandidates;
 
   bool queueIsClosed = false;
   EnqueueTask task;
 
-  Enqueuer(this.compiler)
-    : instanceMembersByName = new Map<String, Link<Element>>(),
+  Enqueuer(this.compiler, Backend backend)
+    : this.backend = backend,
+      instanceMembersByName = new Map<String, Link<Element>>(),
       seenClasses = new Set<ClassElement>(),
       universe = new Universe(),
       queue = new Queue<WorkItem>(),
       resolvedElements = new Map<Element, TreeElements>(),
-      recompilationCandidates = new RecompilationQueue();
+      recompilationCandidates = new RecompilationQueue(backend);
 
   bool get isResolutionQueue() => compiler.enqueuer.resolution === this;
 
   TreeElements getCachedElements(Element element) {
     Element owner = element.getOutermostEnclosingMemberOrTopLevel();
     return compiler.enqueuer.resolution.resolvedElements[owner];
   }
 
   void addToWorkList(Element element, [TreeElements elements]) {
     if (element.isForeign()) return;
     if (compiler.phase == Compiler.PHASE_RECOMPILING) return;
     if (queueIsClosed) {
       if (isResolutionQueue && getCachedElements(element) !== null) return;
       compiler.internalErrorOnElement(element, "Work list is closed.");
     }
     if (!isResolutionQueue &&
         element.kind === ElementKind.GENERATIVE_CONSTRUCTOR) {
       registerInstantiatedClass(element.enclosingElement);
     }
     if (elements === null) {
       elements = getCachedElements(element);
     }
-    queue.add(new WorkItem(element, elements));
+    queue.add(backend.createWorkItem(element, elements));

[Lasse Reichstein Nielsen, 2012/08/08 07:44:53]

If you only use 'backend' for 'createWorkItem', just store the function instead
of passing the entire backend and making the Enquerer depend on Backend
unnecessarily.

[floitsch, 2012/08/08 19:18:37]

Done.

   }
 
   bool canBeRecompiled(Element element) {
     // Only member functions can be recompiled. An exception to this is members
     // of closures. They are processed as part of the enclosing function and not
     // present as a separate element (the call to the closure will be a member
     // function).
     return element.isMember() && !element.getEnclosingClass().isClosure();
   }
 
@@ skipping 215 matching lines @@
   void registerIsCheck(Element element) {
     universe.isChecks.add(element);
   }
 
   void forEach(f(WorkItem work)) {
     while (!queue.isEmpty()) {
       f(queue.removeLast());
     }
   }
 }