Remove cancel and make crash exit with code 253.

sdk/lib/_internal/compiler/implementation/patch_parser.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.
 
 /**
  * This library contains the infrastructure to parse and integrate patch files.
  *
  * Three types of elements can be patched: [LibraryElement], [ClassElement],
  * [FunctionElement]. Patches are introduced in patch libraries which are loaded
  * together with the corresponding origin library. Which libraries that are
@@ skipping 115 matching lines @@
 class PatchParserTask extends leg.CompilerTask {
   PatchParserTask(leg.Compiler compiler): super(compiler);
   final String name = "Patching Parser";
 
   /**
    * Scans a library patch file, applies the method patches and
    * injections to the library, and returns a list of class
    * patches.
    */
   Future patchLibrary(leg.LibraryDependencyHandler handler,
-                    Uri patchUri, LibraryElement originLibrary) {
-    return compiler.readScript(patchUri, null).then((leg.Script script) {
+                      Uri patchUri, LibraryElement originLibrary) {
+    return compiler.readScript(originLibrary, patchUri)
+        .then((leg.Script script) {
       var patchLibrary = new LibraryElementX(script, null, originLibrary);
       return compiler.withCurrentElement(patchLibrary, () {
         handler.registerNewLibrary(patchLibrary);
         var imports = new LinkBuilder<tree.LibraryTag>();
         compiler.withCurrentElement(patchLibrary.entryCompilationUnit, () {
           // This patches the elements of the patch library into [library].
           // Injected elements are added directly under the compilation unit.
           // Patch elements are stored on the patched functions or classes.
           scanLibraryElements(patchLibrary.entryCompilationUnit, imports);
         });
@@ skipping 285 matching lines @@
         patch, leg.MessageKind.PATCH_POINT_TO_CLASS, {'className': patch.name});
     return;
   }
   patchClass(listener, origin, patch);
 }
 
 void patchClass(leg.DiagnosticListener listener,
                  ClassElement origin,
                  ClassElement patch) {
   if (origin.isPatched) {
-    listener.internalErrorOnElement(
-        origin, "Patching the same class more than once.");
+    listener.internalError(origin,
+        "Patching the same class more than once.");
   }
   // TODO(johnniwinther): Change to functions on the ElementX class.
   origin.patch = patch;
   patch.origin = origin;
 }
 
 void tryPatchGetter(leg.DiagnosticListener listener,
                      Element origin,
                      FunctionElement patch) {
   if (!origin.isAbstractField()) {
@@ skipping 74 matching lines @@
                     FunctionElement origin,
                     FunctionElement patch) {
   if (!origin.modifiers.isExternal()) {
     listener.reportError(origin, leg.MessageKind.PATCH_NON_EXTERNAL);
     listener.reportInfo(
         patch,
         leg.MessageKind.PATCH_POINT_TO_FUNCTION, {'functionName': patch.name});
     return;
   }
   if (origin.isPatched) {
-    listener.internalErrorOnElement(origin,
+    listener.internalError(origin,
         "Trying to patch a function more than once.");
   }
   if (origin.cachedNode != null) {
-    listener.internalErrorOnElement(origin,
+    listener.internalError(origin,
         "Trying to patch an already compiled function.");
   }
   // Don't just assign the patch field. This also updates the cachedNode.
   // TODO(johnniwinther): Change to functions on the ElementX class.
   origin.setPatch(patch);
   patch.origin = origin;
 }
 
 // TODO(johnniwinther): Add unittest when patch is (real) metadata.
 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.
   for (Link link = element.metadata; !link.isEmpty; link = link.tail) {
     if (link.head is PatchMetadataAnnotation) return true;
   }
   return false;
 }