Split NativeData

pkg/compiler/lib/src/js_emitter/program_builder/field_visitor.dart

 // Copyright (c) 2015, 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.
 
 part of dart2js.js_emitter.program_builder;
 
 /**
  * [member] is a field (instance, static, or top level).
  *
  * [name] is the field name that the [Namer] has picked for this field's
@@ skipping 40 matching lines @@
    * If [element] is a [LibraryElement], [visitStatics] must be true.
    *
    * When visiting the instance fields of a class, the fields of its superclass
    * are also visited if the class is instantiated.
    *
    * Invariant: [element] must be a declaration element.
    */
   void visitFields(Element element, bool visitStatics, AcceptField f) {
     assert(invariant(element, element.isDeclaration));
 
-    bool isClass = false;
+    ClassElement cls;
+    bool isNativeClass = false;
     bool isLibrary = false;
+    bool isInstantiated = false;
     if (element.isClass) {
-      isClass = true;
+      cls = element;
+      isNativeClass = backend.nativeData.isNativeClass(cls);
+
+      // If the class is never instantiated we still need to set it up for
+      // inheritance purposes, but we can simplify its JavaScript constructor.
+      isInstantiated = compiler.codegenWorldBuilder.directlyInstantiatedClasses
+          .contains(cls);
     } else if (element.isLibrary) {
       isLibrary = true;
       assert(invariant(element, visitStatics));
     } else {
       throw new SpannableAssertionFailure(
           element, 'Expected a ClassElement or a LibraryElement.');
     }
 
-    // If the class is never instantiated we still need to set it up for
-    // inheritance purposes, but we can simplify its JavaScript constructor.
-    bool isInstantiated = compiler
-        .codegenWorldBuilder.directlyInstantiatedClasses
-        .contains(element);
-
     void visitField(Element holder, FieldElement field) {
       assert(invariant(element, field.isDeclaration));
 
-      // Keep track of whether or not we're dealing with a field mixin
-      // into a native class.
-      bool isMixinNativeField =
-          isClass && backend.isNative(element) && holder.isMixinApplication;
+      bool isMixinNativeField = isNativeClass && holder.isMixinApplication;
 
       // See if we can dynamically create getters and setters.
       // We can only generate getters and setters for [element] since
       // the fields of super classes could be overwritten with getters or
       // setters.
       bool needsGetter = false;
       bool needsSetter = false;
       if (isLibrary || isMixinNativeField || holder == element) {
         needsGetter = fieldNeedsGetter(field);
         needsSetter = fieldNeedsSetter(field);
       }
 
-      if ((isInstantiated && !backend.isNative(holder)) ||
+      if ((isInstantiated && !backend.nativeData.isNativeClass(cls)) ||
           needsGetter ||
           needsSetter) {
         js.Name accessorName = namer.fieldAccessorName(field);
         js.Name fieldName = namer.fieldPropertyName(field);
         bool needsCheckedSetter = false;
         if (compiler.options.enableTypeAssertions &&
             needsSetter &&
             !canAvoidGeneratedCheckedSetter(field)) {
           needsCheckedSetter = true;
           needsSetter = false;
         }
         // Getters and setters with suffixes will be generated dynamically.
         f(field, fieldName, accessorName, needsGetter, needsSetter,
             needsCheckedSetter);
       }
     }
 
     if (isLibrary) {
       LibraryElement library = element;
       library.implementation.forEachLocalMember((Element member) {
         if (member.isField) visitField(library, member);
       });
     } else if (visitStatics) {
-      ClassElement cls = element;
       cls.implementation.forEachStaticField(visitField);
     } else {
-      ClassElement cls = element;
       // TODO(kasperl): We should make sure to only emit one version of
       // overridden fields. Right now, we rely on the ordering so the
       // fields pulled in from mixins are replaced with the fields from
       // the class definition.
 
       // If a class is not instantiated then we add the field just so we can
       // generate the field getter/setter dynamically. Since this is only
       // allowed on fields that are in [element] we don't need to visit
       // superclasses for non-instantiated classes.
       cls.implementation.forEachInstanceField(visitField,
@@ skipping 27 matching lines @@
         field is ClosureFieldElement;
   }
 
   bool canAvoidGeneratedCheckedSetter(VariableElement member) {
     // We never generate accessors for top-level/static fields.
     if (!member.isInstanceMember) return true;
     ResolutionDartType type = member.type;
     return type.treatAsDynamic || type.isObject;
   }
 }