dart2js: Only emit constructors of the native class interceptors that are used.

pkg/compiler/lib/src/js_emitter/old_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 {
 
   ClassStubGenerator get _stubGenerator =>
       new ClassStubGenerator(compiler, namer, backend);
@@ skipping 22 matching lines @@
     }
 
     if (classElement.isMixinApplication) {
       String mixinName = namer.getNameOfClass(computeMixinClass(classElement));
       superName = '$superName+$mixinName';
       emitter.needsMixinSupport = true;
     }
 
     ClassBuilder builder = new ClassBuilder(classElement, namer);
     builder.superName = superName;
-    emitClassConstructor(classElement, builder, onlyForRti: onlyForRti);
+    emitPrecompiledConstructor(classElement, onlyForRti: onlyForRti);
     emitFields(classElement, builder, onlyForRti: onlyForRti);
-    emitClassGettersSetters(classElement, builder, onlyForRti: onlyForRti);
+    emitCheckedClassSetters(classElement, builder, onlyForRti: onlyForRti);
+    emitClassGettersSettersForCSP(classElement, builder, onlyForRti: onlyForRti);

[floitsch, 2015/01/19 13:40:31]

Long line.

[zarah, 2015/01/20 09:10:53]

Done.

     emitInstanceMembers(classElement, builder, onlyForRti: onlyForRti);
     emitter.typeTestEmitter.emitIsTests(classElement, builder);
     if (additionalProperties != null) {
       additionalProperties.forEach(builder.addProperty);
     }
 
     if (classElement == backend.closureClass) {
       // We add a special getter here to allow for tearing off a closure from
       // itself.
       String name = namer.getMappedInstanceName(Compiler.CALL_OPERATOR_NAME);
       jsAst.Fun function = js('function() { return this; }');
       builder.addProperty(namer.getterNameFromAccessorName(name), function);
     }
 
     emitTypeVariableReaders(classElement, builder);
 
     emitClassBuilderWithReflectionData(
         className, classElement, builder, properties);
   }
-
-  void emitClassConstructor(ClassElement classElement,
-                            ClassBuilder builder,
+  /**
+  * Emits the precompiled constructor when in CSP mode.
+  */
+  void emitPrecompiledConstructor(ClassElement classElement,
                             {bool onlyForRti: false}) {
     List<String> fields = <String>[];
-    if (!onlyForRti && !classElement.isNative) {
-      visitFields(classElement, false,
-                  (Element member,
-                   String name,
-                   String accessorName,
-                   bool needsGetter,
-                   bool needsSetter,
-                   bool needsCheckedSetter) {
-        fields.add(name);
-      });
-    }
+
+    if (!compiler.useContentSecurityPolicy

[floitsch, 2015/01/19 13:40:32]

Are you sure this is correct?

I think we still need the constructorAst, even when we don't need the fields (as
in onlyForRti).

[zarah, 2015/01/20 09:10:53]

Done.

+        || onlyForRti
+        || classElement.isNative) return;
+
+    visitFields(classElement, false,
+                (Element member,
+                 String name,
+                 String accessorName,
+                 bool needsGetter,
+                 bool needsSetter,
+                 bool needsCheckedSetter) {
+      fields.add(name);
+    });
 
     jsAst.Expression constructorAst =
         _stubGenerator.generateClassConstructor(classElement, fields);
 
     String constructorName = namer.getNameOfClass(classElement);
     OutputUnit outputUnit =
         compiler.deferredLoadTask.outputUnitForElement(classElement);
     emitter.emitPrecompiledConstructor(
         outputUnit, constructorName, constructorAst, fields);
   }
@@ skipping 120 matching lines @@
         }
       });
     }
 
     if (hasMetadata) {
       builder.fieldMetadata = fieldMetadata;
     }
     return fieldsAdded;
   }
 
-  void emitClassGettersSetters(ClassElement classElement,
+  /// Emits checked setters for fields.
+  void emitCheckedClassSetters(ClassElement classElement,
                                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);
         }
+      });
+    });
+  }
+
+  /// Emits getters/setters for fields if compiling in CSP mode.
+  void emitClassGettersSettersForCSP(ClassElement classElement,

[floitsch, 2015/01/19 13:40:31]

Should be consistent.
Either rename emitPrecompiledConstructors to emitConstructorsForCSP, or rename
here.

[zarah, 2015/01/20 09:10:53]

Done.

+                               ClassBuilder builder,
+                               {bool onlyForRti: false}) {
+
+    if (!compiler.useContentSecurityPolicy || onlyForRti) return;
+
+    visitFields(classElement, false,
+                (VariableElement member,
+                 String name,
+                 String accessorName,
+                 bool needsGetter,
+                 bool needsSetter,
+                 bool needsCheckedSetter) {
+      compiler.withCurrentElement(member, () {
         if (needsGetter) {
-          generateGetter(member, name, accessorName, builder);
+          generateGetterForCSP(member, name, accessorName, builder);
         }
         if (needsSetter) {
-          generateSetter(member, name, accessorName, builder);
+          generateSetterForCSP(member, name, accessorName, builder);
         }
       });
     });
   }
 
   /**
    * Documentation wanted -- johnniwinther
    *
    * Invariant: [classElement] must be a declaration element.
    */
@@ skipping 246 matching lines @@
                              ClassBuilder builder) {
     jsAst.Expression code = backend.generatedCode[member];
     assert(code != null);
     String setterName = namer.setterNameFromAccessorName(accessorName);
     compiler.dumpInfoTask.registerElementAst(member,
         builder.addProperty(setterName, code));
     generateReflectionDataForFieldGetterOrSetter(
         member, setterName, builder, isGetter: false);
   }
 
-  void generateGetter(Element member, String fieldName, String accessorName,
+  void generateGetterForCSP(Element member, String fieldName, String accessorName,

[floitsch, 2015/01/19 13:40:31]

I would rename to "emitGetterForCSP".

I use "generate" when something is returned and it doesn't have a side-effect.
"Emit", when something is emitted (thus having a side-effect).
The line is blurred, when the generated thing is stored in the builder, but I
still prefer `emit` there.

[floitsch, 2015/01/19 13:40:31]

long line.

[zarah, 2015/01/20 09:10:53]

Done.

[zarah, 2015/01/20 09:10:53]

Done.

                       ClassBuilder builder) {
     jsAst.Expression function =
         _stubGenerator.generateGetter(member, fieldName);
 
     String getterName = namer.getterNameFromAccessorName(accessorName);
     ClassElement cls = member.enclosingClass;
     String className = namer.getNameOfClass(cls);
     OutputUnit outputUnit =
         compiler.deferredLoadTask.outputUnitForElement(member);
     emitter.cspPrecompiledFunctionFor(outputUnit).add(
         js('#.prototype.# = #', [className, getterName, function]));
     if (backend.isAccessibleByReflection(member)) {
       emitter.cspPrecompiledFunctionFor(outputUnit).add(
           js('#.prototype.#.${namer.reflectableField} = 1',
               [className, getterName]));
     }
   }
 
-  void generateSetter(Element member, String fieldName, String accessorName,
+  void generateSetterForCSP(Element member, String fieldName, String accessorName,

[floitsch, 2015/01/19 13:40:32]

long line.

[zarah, 2015/01/20 09:10:53]

Done.

                       ClassBuilder builder) {
     jsAst.Expression function =
         _stubGenerator.generateSetter(member, fieldName);
 
     String setterName = namer.setterNameFromAccessorName(accessorName);
     ClassElement cls = member.enclosingClass;
     String className = namer.getNameOfClass(cls);
     OutputUnit outputUnit =
         compiler.deferredLoadTask.outputUnitForElement(member);
     emitter.cspPrecompiledFunctionFor(outputUnit).add(
@@ skipping 55 matching lines @@
           js(r'this.$builtinTypeInfo && this.$builtinTypeInfo[#]', index);
     }
     jsAst.Expression convertRtiToRuntimeType = emitter
         .staticFunctionAccess(backend.findHelper('convertRtiToRuntimeType'));
     compiler.dumpInfoTask.registerElementAst(element,
         builder.addProperty(name,
             js('function () { return #(#) }',
                 [convertRtiToRuntimeType, computeTypeVariable])));
   }
 }