Stub implementation of patch invariants for the patch refactoring.

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,
+    : codegen = new Enqueuer('codegen enqueuer', compiler,

[ahe, 2012/09/18 11:25:54]

Nice.

                              compiler.backend.createItemCompilationContext),
-      resolution = new Enqueuer(compiler,
+      resolution = new Enqueuer('resolution enqueuer', compiler,
                                 compiler.backend.createItemCompilationContext),
       super(compiler) {
     codegen.task = this;
     resolution.task = this;
   }
 }
 
 class RecompilationQueue {
   final Function itemCompilationContextCreator;
   final Queue<WorkItem> queue;
@@ skipping 17 matching lines @@
 
   WorkItem next() {
     WorkItem item = queue.removeLast();
     queueElements.remove(item.element);
     processed++;
     return item;
   }
 }
 
 class Enqueuer {
+  final String name;
   final Compiler compiler; // TODO(ahe): Remove this dependency.
   final Function itemCompilationContextCreator;
   final Map<String, Link<Element>> instanceMembersByName;
   final Set<ClassElement> seenClasses;
   final Universe universe;
   final Queue<WorkItem> queue;
+  // Invariant: Key elements are declarations.
   final Map<Element, TreeElements> resolvedElements;
   final RecompilationQueue recompilationCandidates;
 
   bool queueIsClosed = false;
   EnqueueTask task;
 
-  Enqueuer(this.compiler,
+  Enqueuer(this.name, this.compiler,
            ItemCompilationContext itemCompilationContextCreator())
     : this.itemCompilationContextCreator = itemCompilationContextCreator,
       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(itemCompilationContextCreator);
 
   bool get isResolutionQueue => compiler.enqueuer.resolution === this;
 
   TreeElements getCachedElements(Element element) {
     // TODO(ngeoffray): Get rid of this check.
     if (element.enclosingElement.isClosure()) {
       closureMapping.ClosureClassElement cls = element.enclosingElement;
       element = cls.methodElement;
     }
     Element owner = element.getOutermostEnclosingMemberOrTopLevel();
-    return compiler.enqueuer.resolution.resolvedElements[owner];
+    return compiler.enqueuer.resolution.resolvedElements[owner.declaration];
   }
 
-  String lookupCode(Element element) =>
-      universe.generatedCode[element].toString();
+  /**
+   * Invariant: [element] must be the declaration element.

[ahe, 2012/09/18 11:25:54]

Not documentation.

[Johnni Winther, 2012/09/20 08:12:23]

Done.

+   */
+  String lookupCode(Element element) {
+    assert(element.isDeclaration);
+    return universe.generatedCode[element].toString();

[ahe, 2012/09/18 11:25:54]

Why are you calling toString here?

[Johnni Winther, 2012/09/20 08:12:23]

I have no idea. It was there before this CL.

+  }
 
+  /**
+   * Invariant: [element] must be the declaration element.

[ahe, 2012/09/18 11:25:54]

Not documentation.

[Johnni Winther, 2012/09/20 08:12:23]

Done.

+   */
   void addToWorkList(Element element, [TreeElements elements]) {
+    assert(element.isDeclaration);
     if (element.isForeign()) return;
     if (compiler.phase == Compiler.PHASE_RECOMPILING) return;
     if (queueIsClosed) {
       if (isResolutionQueue && getCachedElements(element) !== null) return;
+      print('$element: isMember=${element.isMember()} isInstanceMember=${element.isInstanceMember()}');

[ngeoffray, 2012/09/17 12:46:24]

Remove debugging code.

[Johnni Winther, 2012/09/20 08:12:23]

Done.

       compiler.internalErrorOnElement(element, "Work list is closed.");
     }
     if (!isResolutionQueue &&
         element.kind === ElementKind.GENERATIVE_CONSTRUCTOR) {
       registerInstantiatedClass(element.getEnclosingClass());
     }
     if (elements === null) {
       elements = getCachedElements(element);
     }
     if (isResolutionQueue) {
       compiler.world.registerUsedElement(element);
     }
 
     queue.add(new WorkItem(element, elements, itemCompilationContextCreator()));
 
     // Enable isolate support if we start using something from the
     // isolate library.
     LibraryElement library = element.getLibrary();
     if (!compiler.hasIsolateSupport()
         && library.uri.toString() == 'dart:isolate') {
       compiler.enableIsolateSupport(library);
     }
   }
 
+  /**
+   * Invariant: [element] must be the declaration element.
+   */
   void eagerRecompile(Element element) {
+    assert(element.isDeclaration);
     universe.generatedCode.remove(element);
     universe.generatedBailoutCode.remove(element);
     addToWorkList(element);
   }
 
   void registerRecompilationCandidate(Element element,
                                       [TreeElements elements]) {
     if (queueIsClosed) {
-      compiler.internalErrorOnElement(element, "Work list is closed.");
+      compiler.internalErrorOnElement(element, "$name work list is closed.");
     }
     recompilationCandidates.add(element, elements);
   }
 
   void registerInstantiatedClass(ClassElement cls) {
     if (cls.isInterface()) {
       compiler.internalErrorOnElement(
           // Use the current element, as this is where cls is referenced from.
           compiler.currentElement,
           'Expected a class, but $cls is an interface.');
@@ skipping 14 matching lines @@
       }
     });
     return true;
   }
 
   void processInstantiatedClass(ClassElement cls) {
     cls.localMembers.forEach(processInstantiatedClassMember);
   }
 
   void processInstantiatedClassMember(Element member) {
+    assert(member.isDeclaration);
     if (universe.generatedCode.containsKey(member)) return;
     if (resolvedElements[member] !== null) return;
     if (!member.isInstanceMember()) return;
     if (member.isField()) return;
 
     String memberName = member.name.slowToString();
     Link<Element> members = instanceMembersByName.putIfAbsent(
         memberName, () => const EmptyLink<Element>());
     instanceMembersByName[memberName] = members.prepend(member);
 
@@ skipping 115 matching lines @@
   void handleUnseenSelector(SourceString methodName, Selector selector) {
     processInstanceMembers(methodName, (Element member) {
       if (selector.applies(member, compiler)) {
         addToWorkList(member);
         return true;
       }
       return false;
     });
   }
 
+  /**
+   * Invariant: [element] must be the declaration element.

[ahe, 2012/09/18 11:25:54]

Not documentation.

[Johnni Winther, 2012/09/20 08:12:23]

Done.

+   */
   void registerStaticUse(Element element) {
-    if (element !== null) addToWorkList(element);
+    if (element == null) return;
+    assert(element.isDeclaration);
+    addToWorkList(element);
   }
 
   void registerGetOfStaticFunction(FunctionElement element) {
     registerStaticUse(element);
     universe.staticFunctionsNeedingGetter.add(element);
   }
 
   void registerDynamicInvocation(SourceString methodName, Selector selector) {
     assert(selector !== null);
     registerInvocation(methodName, selector);
@@ skipping 35 matching lines @@
 
   void registerIsCheck(DartType type) {
     universe.isChecks.add(type);
   }
 
   void forEach(f(WorkItem work)) {
     while (!queue.isEmpty()) {
       f(queue.removeLast()); // TODO(kasperl): Why isn't this removeFirst?
     }
   }
+
+  String toString() => name;

[ahe, 2012/09/18 11:25:54]

I prefer this: 'Enqueuer($name)'

This makes debugging by print easier, as getting the class name is hard.

[Johnni Winther, 2012/09/20 08:12:23]

Done.

 }