Patch refactoring.

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;
@@ skipping 291 matching lines @@
       return;
     }
     enabledNoSuchMethod = true;
     Selector selector = new Selector.noSuchMethod();
     enqueuer.resolution.registerInvocation(NO_SUCH_METHOD, selector);
     enqueuer.codegen.registerInvocation(NO_SUCH_METHOD, selector);
   }
 
   void enableIsolateSupport(LibraryElement element) {
     // TODO(ahe): Move this method to Enqueuer.
-    isolateLibrary = element;
-    enqueuer.resolution.addToWorkList(element.find(START_ROOT_ISOLATE));
+    isolateLibrary = element.patch;
+    enqueuer.resolution.addToWorkList(isolateLibrary.find(START_ROOT_ISOLATE));
     enqueuer.resolution.addToWorkList(
-        element.find(const SourceString('_currentIsolate')));
+        isolateLibrary.find(const SourceString('_currentIsolate')));
     enqueuer.resolution.addToWorkList(
-        element.find(const SourceString('_callInIsolate')));
-    enqueuer.codegen.addToWorkList(element.find(START_ROOT_ISOLATE));
+        isolateLibrary.find(const SourceString('_callInIsolate')));
+    enqueuer.codegen.addToWorkList(isolateLibrary.find(START_ROOT_ISOLATE));
   }
 
   bool hasIsolateSupport() => isolateLibrary !== null;
 
   void onLibraryLoaded(LibraryElement library, Uri uri) {
     if (dynamicClass !== null) {
       // When loading the built-in libraries, dynamicClass is null. We
       // take advantage of this as core and coreimpl import js_helper
       // and see Dynamic this way.
       withCurrentElement(dynamicClass, () {
@@ skipping 82 matching lines @@
           originalElement = originalField.getter;
         } else {
           originalElement = originalField.setter;
         }
       }
       if (originalElement === null) {
         if (isPatchElement(patchElement)) {
           internalError("Cannot patch non-existing member '"
                         "${patchElement.name.slowToString()}'.");
         }
-        original.addMember(clonePatch(patchElement, original), this);
       } else {
         patchMember(originalElement, patchElement);
       }
       patches = patches.tail;
     }
   }
 
   bool isPatchElement(Element element) {
     // TODO(lrn): More checks needed if we introduce metadata for real.
     // In that case, it must have the identifier "native" as metadata.
@@ skipping 54 matching lines @@
     if (element.isPatched) {
       internalError("Trying to patch a function more than once.",
                     element: element);
     }
     if (element.cachedNode !== null) {
       internalError("Trying to patch an already compiled function.",
                     element: element);
     }
     // Don't just assign the patch field. This also updates the cachedNode.
     element.setPatch(patchElement);
+    patchElement.origin = element;
   }
 
   /**
    * Get an [Uri] pointing to a patch for the dart: library with
    * the given path. Returns null if there is no patch.
    */
   abstract Uri resolvePatchUri(String dartLibraryPath);
 
   /** Define the JS helper functions in the given library. */
   void addForeignFunctions(LibraryElement library) {
@@ skipping 324 matching lines @@
       // error" or "not implemented yet", so the vicinity is good
       // enough for now.
       element = element.enclosingElement;
       // TODO(ahe): I plan to overhaul this infrastructure anyways.
     }
     if (element === null) {
       element = currentElement;
     }
     Token position = element.position();
     Uri uri = element.getCompilationUnit().script.uri;
-
-    // TODO(ager,johnniwinther): The patch support should be
-    // reworked to allow us to get rid of this.
-    if (element.isPatched) {
-      // TODO(johnniwinther,karlklose): create a subtype of Element for
-      // patchable elements or move the patch field to Element.
-      var patched = element;
-      position = patched.patch.position();
-      uri = patched.patch.getCompilationUnit().script.uri;
-    }
-
     return (position === null)
         ? new SourceSpan(uri, 0, 0)
         : spanFromTokens(position, position, uri);
   }
 
   Script readScript(Uri uri, [ScriptTag node]) {
     unimplemented('Compiler.readScript');
   }
 
   String get legDirectory {
@@ skipping 90 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;
 }