Reverting 7667

lib/compiler/implementation/native_handler.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.
 
 #library('native');
 #import('dart:uri');
 #import('leg.dart');
 #import('elements/elements.dart');
 #import('scanner/scannerlib.dart');
 #import('ssa/ssa.dart');
 #import('tree/tree.dart');
 #import('util/util.dart');
 
-void processNativeClasses(CodeEmitterTask emitter,
+void processNativeClasses(Compiler compiler,
                           Collection<LibraryElement> libraries) {
   for (LibraryElement library in libraries) {
-    processNativeClassesInLibrary(emitter, library);
+    processNativeClassesInLibrary(compiler, library);
   }
 }
 
 void addSubtypes(ClassElement cls,
                  NativeEmitter emitter) {
   for (Type type in cls.allSupertypes) {
     List<Element> subtypes = emitter.subtypes.putIfAbsent(
         type.element,
         () => <ClassElement>[]);
     subtypes.add(cls);
   }
 
   List<Element> directSubtypes = emitter.directSubtypes.putIfAbsent(
       cls.superclass,
       () => <ClassElement>[]);
   directSubtypes.add(cls);
 }
 
-void processNativeClassesInLibrary(CodeEmitterTask emitter,
+void processNativeClassesInLibrary(Compiler compiler,
                                    LibraryElement library) {
   bool hasNativeClass = false;
-  final compiler = emitter.compiler;
   for (Link<Element> link = library.topLevelElements;
        !link.isEmpty(); link = link.tail) {
     Element element = link.head;
     if (element.kind == ElementKind.CLASS) {
       ClassElement classElement = element;
       if (classElement.isNative()) {
         hasNativeClass = true;
         compiler.registerInstantiatedClass(classElement);
         // Also parse the node to know all its methods because
         // otherwise it will only be parsed if there is a call to
         // one of its constructor.
         classElement.parseNode(compiler);
         // Resolve to setup the inheritance.
         classElement.ensureResolved(compiler);
         // Add the information that this class is a subtype of
         // its supertypes. The code emitter and the ssa builder use that
         // information.
-        addSubtypes(classElement, emitter.nativeEmitter);
+        NativeEmitter emitter = compiler.emitter.nativeEmitter;
+        addSubtypes(classElement, emitter);
       }
     }
   }
   if (hasNativeClass) {
     compiler.registerStaticUse(compiler.findHelper(
         const SourceString('dynamicFunction')));
     compiler.registerStaticUse(compiler.findHelper(
         const SourceString('dynamicSetMetadata')));
     compiler.registerStaticUse(compiler.findHelper(
         const SourceString('defineProperty')));
@@ skipping 120 matching lines @@
   for (ClassElement subtype in subtypes) {
     if (subtype.lookupLocalMember(element.name) != null) return true;
   }
   return false;
 }
 
 void handleSsaNative(SsaBuilder builder, Send node) {
   Compiler compiler = builder.compiler;
   FunctionElement element = builder.work.element;
   element.setNative();
-  NativeEmitter nativeEmitter = builder.emitter.nativeEmitter;
+  NativeEmitter nativeEmitter = compiler.emitter.nativeEmitter;
   // If what we're compiling is a getter named 'typeName' and the native
   // class is named 'DOMType', we generate a call to the typeNameOf
   // function attached on the isolate.
   // The DOM classes assume that their 'typeName' property, which is
   // not a JS property on the DOM types, returns the type name.
   if (element.name == const SourceString('typeName')
       && element.isGetter()
       && nativeEmitter.toNativeName(element.enclosingElement) == 'DOMType') {
     Element methodElement =
         compiler.findHelper(const SourceString('getTypeNameOf'));
@@ skipping 31 matching lines @@
     String str = jsCode.dartString.slowToString();
     if (nativeRedirectionRegExp.hasMatch(str)) {
       nativeMethodName = str;
       isRedirecting = true;
     } else {
       hasBody = true;
     }
   }
 
   if (!hasBody) {
-    nativeEmitter.nativeMethods.add(element);
+    compiler.emitter.nativeEmitter.nativeMethods.add(element);
   }
 
   FunctionSignature parameters = element.computeSignature(builder.compiler);
   if (!hasBody) {
     List<String> arguments = <String>[];
     List<HInstruction> inputs = <HInstruction>[];
     String receiver = '';
     if (element.isInstanceMember()) {
       receiver = '#.';
       inputs.add(builder.localsHandler.readThis());
@@ skipping 85 matching lines @@
                                       String parameters) {
   buffer.add("  if (Object.getPrototypeOf(this).hasOwnProperty");
   buffer.add("('$methodName')) {\n");
   buffer.add("  $code");
   buffer.add("  } else {\n");
   buffer.add("    return Object.prototype.$methodName.call(this");
   buffer.add(parameters == '' ? '' : ', $parameters');
   buffer.add(");\n");
   buffer.add("  }\n");
 }