Generate onlyForRti class constructor for csp.

sdk/lib/_internal/compiler/implementation/js_emitter/class_emitter.dart

 // Copyright (c) 2013, 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;
 
 class ClassEmitter extends CodeEmitterHelper {
   /**
    * Documentation wanted -- johnniwinther
    *
@@ skipping 17 matching lines @@
     String runtimeName =
         namer.getPrimitiveInterceptorRuntimeName(classElement);
 
     if (classElement.isMixinApplication) {
       String mixinName = namer.getNameOfClass(computeMixinClass(classElement));
       superName = '$superName+$mixinName';
       task.needsMixinSupport = true;
     }
 
     ClassBuilder builder = new ClassBuilder();
-    if (!onlyForRti) {
-      emitClassConstructor(classElement, builder, runtimeName);
-    }
+    emitClassConstructor(classElement, builder, runtimeName,
+                         onlyForRti: onlyForRti);
     emitFields(classElement, builder, superName, onlyForRti: onlyForRti);
-    if (!onlyForRti) {
-      emitClassGettersSetters(classElement, builder);
-      if (!classElement.isMixinApplication) {
-        emitInstanceMembers(classElement, builder);
-      }
-    }
+    emitClassGettersSetters(classElement, builder, onlyForRti: onlyForRti);
+    emitInstanceMembers(classElement, builder, onlyForRti: onlyForRti);
     task.typeTestEmitter.emitIsTests(classElement, builder);
 
     emitClassBuilderWithReflectionData(
         className, classElement, builder, buffer);
   }
 
   void emitClassConstructor(ClassElement classElement,
                             ClassBuilder builder,
-                            String runtimeName) {
+                            String runtimeName,
+                            {bool onlyForRti: false}) {
     List<String> fields = <String>[];
-    if (!classElement.isNative()) {
+    if (!onlyForRti && !classElement.isNative()) {
       visitFields(classElement, false,
                   (Element member,
                    String name,
                    String accessorName,
                    bool needsGetter,
                    bool needsSetter,
                    bool needsCheckedSetter) {
         fields.add(name);
       });
     }
@@ skipping 153 matching lines @@
     jsAst.Expression classDataNode = js.string(compactClassData);
     if (hasMetadata) {
       fieldMetadata.insert(0, classDataNode);
       classDataNode = new jsAst.ArrayInitializer.from(fieldMetadata);
     }
     builder.addProperty('', classDataNode);
     return fieldsAdded;
   }
 
   void emitClassGettersSetters(ClassElement classElement,
-                               ClassBuilder builder) {
+                               ClassBuilder builder,
+                               {bool onlyForRti: false}) {
+    if (onlyForRti) return;
+
     visitFields(classElement, false,
                 (VariableElement member,
                  String name,
                  String accessorName,
                  bool needsGetter,
                  bool needsSetter,
                  bool needsCheckedSetter) {
       compiler.withCurrentElement(member, () {
         if (needsCheckedSetter) {
           assert(!needsSetter);
           generateCheckedSetter(member, name, accessorName, builder);
         }
         if (needsGetter) {
           generateGetter(member, name, accessorName, builder);
         }
         if (needsSetter) {
           generateSetter(member, name, accessorName, builder);
         }
       });
     });
   }
 
   /**
    * Documentation wanted -- johnniwinther
    *
    * Invariant: [classElement] must be a declaration element.
    */
   void emitInstanceMembers(ClassElement classElement,
-                           ClassBuilder builder) {
+                           ClassBuilder builder,
+                           {bool onlyForRti: false}) {
     assert(invariant(classElement, classElement.isDeclaration));
 
+    if (classElement.isMixinApplication) return;

[kasperl, 2013/10/16 08:23:51]

Combine the two checks?

[Johnni Winther, 2013/10/16 08:30:10]

Done.

+    if (onlyForRti) return;
+
     void visitMember(ClassElement enclosing, Element member) {
       assert(invariant(classElement, member.isDeclaration));
       if (member.isInstanceMember()) {
         task.containerBuilder.addMember(member, builder);
       }
     }
 
     classElement.implementation.forEachMember(
         visitMember,
         includeBackendMembers: true);
@@ skipping 317 matching lines @@
         ? new Selector.getter(member.name, member.getLibrary())
         : new Selector.setter(member.name, member.getLibrary());
     String reflectionName = task.getReflectionName(selector, name);
     if (reflectionName != null) {
       var reflectable =
           js(backend.isAccessibleByReflection(member) ? '1' : '0');
       builder.addProperty('+$reflectionName', reflectable);
     }
   }
 }