Revert "Parameterize WorkItem.run."

dart/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.
 
 class WorkItem {
   final Element element;
   TreeElements resolutionTree;
   bool allowSpeculativeOptimization = true;
   List<HTypeGuard> guards = const <HTypeGuard>[];
 
   WorkItem(this.element, this.resolutionTree);
 
   bool isAnalyzed() => resolutionTree !== null;
 
-  String run(Compiler compiler, Enqueuer world) {
-    String code = world.universe.generatedCode[element];
+  int hashCode() => element.hashCode();
+
+  String run(Compiler compiler) {
+    String code = compiler.codegenWorld.generatedCode[element];
     if (code !== null) return code;
-    if (!isAnalyzed()) compiler.analyze(this);
-    return compiler.codegen(this);
+    try {
+      if (!isAnalyzed()) compiler.analyze(this);
+      return compiler.codegen(this);
+    } catch (CompilerCancelledException ex) {
+      throw;
+    } catch (var ex) {
+      compiler.unhandledExceptionOnElement(element);
+      throw;
+    }
   }
 }
 
 class Backend {
   final Compiler compiler;
 
   Backend(this.compiler);
 
   abstract String codegen(WorkItem work);
   abstract void processNativeClasses(world, libraries);
@@ skipping 69 matching lines @@
   ClassElement functionClass;
   ClassElement nullClass;
   ClassElement listClass;
 
   Element get currentElement() => _currentElement;
   withCurrentElement(Element element, f()) {
     Element old = currentElement;
     _currentElement = element;
     try {
       return f();
-    } catch (CompilerCancelledException ex) {
-      throw;
-    } catch (var ex) {
-      unhandledExceptionOnElement(element);
-      throw;
     } finally {
       _currentElement = old;
     }
   }
 
   List<CompilerTask> tasks;
   ScannerTask scanner;
   DietParserTask dietParser;
   ParserTask parser;
   TreeValidatorTask validator;
@@ skipping 243 matching lines @@
                              "work list is not empty");
     }
   }
 
   processQueue(Enqueuer world, Element main) {
     backend.processNativeClasses(world, libraries.getValues());
     world.addToWorkList(main);
     codegenProgress.reset();
     while (!world.queue.isEmpty()) {
       WorkItem work = world.queue.removeLast();
-      withCurrentElement(work.element, () => work.run(this, world));
+      withCurrentElement(work.element, () => work.run(this));
     }
     world.queueIsClosed = true;
     assert(world.checkNoEnqueuedInvokedInstanceMethods());
     world.registerFieldClosureInvocations();
   }
 
   TreeElements analyzeElement(Element element) {
     assert(parser !== null);
     Node tree = parser.parse(element);
     validator.validate(tree);
@@ skipping 186 matching lines @@
     // invariant that endOffset > beginOffset, but for EOF the
     // charoffset of the next token may be [beginOffset]. This can
     // also happen for synthetized tokens that are produced during
     // error handling.
     final endOffset =
       Math.max((end.next !== null) ? end.next.charOffset : 0, beginOffset + 1);
     assert(endOffset > beginOffset);
     return f(beginOffset, endOffset);
   }
 }