Fix issues that caused revert of r30955:

dart/sdk/lib/_internal/compiler/implementation/js_emitter/container_builder.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;
 
 /// This class should morph into something that makes it easy to build
 /// JavaScript representations of libraries, class-sides, and instance-sides.
 /// Initially, it is just a placeholder for code that is moved from
 /// [CodeEmitterTask].
@@ skipping 308 matching lines @@
   void addMemberMethod(FunctionElement member, ClassBuilder builder) {
     if (member.isAbstract) return;
     jsAst.Expression code = backend.generatedCode[member];
     if (code == null) return;
     String name = namer.getNameOfMember(member);
     task.interceptorEmitter.recordMangledNameOfMemberMethod(member, name);
     FunctionSignature parameters = member.computeSignature(compiler);
     bool needsStubs = !parameters.optionalParameters.isEmpty;
     bool canTearOff = false;
     bool isClosure = false;
+    bool canBeApplied = compiler.enabledFunctionApply;
     String tearOffName;
     if (!member.isFunction() || member.isConstructor() || member.isAccessor()) {
       canTearOff = false;
+      canBeApplied = false;
     } else if (member.isInstanceMember()) {
       if (member.getEnclosingClass().isClosure()) {
         canTearOff = false;
         isClosure = true;
       } else {
         // Careful with operators.
         canTearOff = compiler.codegenWorld.hasInvokedGetter(member, compiler);
         tearOffName = namer.getterName(member);
       }
     } else {
       canTearOff =
           compiler.codegenWorld.staticFunctionsNeedingGetter.contains(member);
       tearOffName = namer.getStaticClosureName(member);
     }
 
     bool canBeReflected = backend.isAccessibleByReflection(member);
     bool needStructuredInfo =
-        canTearOff || canBeReflected || compiler.enabledFunctionApply;
+        canTearOff || canBeReflected || canBeApplied;
     if (!needStructuredInfo) {
       builder.addProperty(name, code);
       if (needsStubs) {
         addParameterStubs(
             member,
             (Selector selector, jsAst.Fun function) {
               builder.addProperty(namer.invocationName(selector), function);
             });
       }
       return;
@@ skipping 82 matching lines @@
         if (canTearOff && callSelectors != null &&
             callSelectors.contains(callSelector)) {
           callSelectorString = '"${namer.invocationName(callSelector)}"';
         }
         tearOffInfo.add(
             new jsAst.LiteralString('$callSelectorString /* tearOffInfo */'));
       }, canTearOff);
     }
 
     jsAst.Expression memberTypeExpression;
-    if ((canTearOff || canBeReflected) &&
-        !member.isGenerativeConstructorBody()) {
-      DartType memberType = member.computeType(compiler);
+    if (canTearOff || canBeReflected) {
+      DartType memberType;
+      if (member.isGenerativeConstructorBody()) {
+        var body = member;
+        memberType = body.constructor.computeType(compiler);
+      } else {
+        memberType = member.computeType(compiler);
+      }
       if (memberType.containsTypeVariables) {
         jsAst.Expression thisAccess = js(r'this.$receiver');
         memberTypeExpression =
             backend.rti.getSignatureEncoding(memberType, thisAccess);
       } else {
         memberTypeExpression =
             js.toExpression(task.metadataEmitter.reifyType(memberType));
       }
     } else {
       memberTypeExpression = js('null');
     }
 
     expressions
         ..addAll(tearOffInfo)
         ..add((tearOffName == null || member.isAccessor())
               ? js("null") : js.string(tearOffName))
         ..add(requiredParameterCount)
         ..add(optionalParameterCount)
         ..add(memberTypeExpression)
         ..addAll(task.metadataEmitter.reifyDefaultArguments(member));
 
-    if (canBeReflected || compiler.enabledFunctionApply) {
+    if (canBeReflected || canBeApplied) {
       parameters.orderedForEachParameter((Element parameter) {
         expressions.add(task.metadataEmitter.reifyName(parameter.name));
       });
     }
     if (canBeReflected) {
       jsAst.LiteralString reflectionName;
       if (member.isConstructor()) {
         String reflectionNameString = task.getReflectionName(member, name);
         reflectionName =
             new jsAst.LiteralString(
                 '"new ${Elements.reconstructConstructorName(member)}"'
                 ' /* $reflectionNameString */');
       } else {
         reflectionName = js.string(member.name);
       }
       expressions
           ..add(reflectionName)
           ..addAll(task.metadataEmitter.computeMetadata(member));
-    } else if (isClosure && compiler.enabledFunctionApply) {
+    } else if (isClosure && canBeApplied) {
       expressions.add(js.string(member.name));
     }
 
     builder.addProperty(name, js.toExpression(expressions));
   }
 
   void addMemberField(VariableElement member, ClassBuilder builder) {
     // For now, do nothing.
   }
 }