Revert "Clean up naming scheme for reflection names."

pkg/compiler/lib/src/js_emitter/old_emitter/emitter.dart

 // Copyright (c) 2014, 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 OldEmitter implements Emitter {
   final Compiler compiler;
   final CodeEmitterTask task;
@@ skipping 343 matching lines @@
     }
     if (elementOrSelector is Element && elementOrSelector.isClosure) {
       // Closures are synthesized and their name might conflict with existing
       // globals. Assign an illegal name, and make sure they don't clash
       // with each other.
       return " $mangledName";
     }
     if (elementOrSelector is Selector
         || elementOrSelector.isFunction
         || elementOrSelector.isConstructor) {
-      int positionalParameterCount;
+      int requiredParameterCount;
+      int optionalParameterCount;
       String namedArguments = '';
       bool isConstructor = false;
       if (elementOrSelector is Selector) {
         Selector selector = elementOrSelector;
-        positionalParameterCount = selector.positionalArgumentCount;
+        requiredParameterCount = selector.argumentCount;
+        optionalParameterCount = 0;
         namedArguments = namedParametersAsReflectionNames(selector);
       } else {
         FunctionElement function = elementOrSelector;
         if (function.isConstructor) {
           isConstructor = true;
           name = Elements.reconstructConstructorName(function);
         }
         FunctionSignature signature = function.functionSignature;
-        positionalParameterCount = signature.requiredParameterCount;
+        requiredParameterCount = signature.requiredParameterCount;
+        optionalParameterCount = signature.optionalParameterCount;
         if (signature.optionalParametersAreNamed) {
           var names = [];
           for (Element e in signature.optionalParameters) {
             names.add(e.name);
           }
           Selector selector = new Selector.call(
               function.name,
               function.library,
-              positionalParameterCount,
+              requiredParameterCount,
               names);
           namedArguments = namedParametersAsReflectionNames(selector);
         } else {
-          // Named parameters are handled differently by mirrors. For unnamed
+          // Named parameters are handled differently by mirrors.  For unnamed
           // parameters, they are actually required if invoked
           // reflectively. Also, if you have a method c(x) and c([x]) they both
           // get the same mangled name, so they must have the same reflection
           // name.
-          positionalParameterCount += signature.optionalParameterCount;
+          requiredParameterCount += optionalParameterCount;
+          optionalParameterCount = 0;
         }
       }
-      String suffix = '$name:$positionalParameterCount$namedArguments';
+      String suffix =
+          // TODO(ahe): We probably don't need optionalParameterCount in the
+          // reflection name.
+          '$name:$requiredParameterCount:$optionalParameterCount'
+          '$namedArguments';
       return (isConstructor) ? 'new $suffix' : suffix;
     }
     Element element = elementOrSelector;
     if (element.isGenerativeConstructorBody) {
       return null;
     } else if (element.isClass) {
       ClassElement cls = element;
       if (cls.isUnnamedMixinApplication) return null;
       return cls.name;
     } else if (element.isTypedef) {
@@ skipping 1386 matching lines @@
     for (Element element in compiler.enqueuer.codegen.newlyEnqueuedElements) {
       if (element.isInstanceMember) {
         cachedClassBuilders.remove(element.enclosingClass);
 
         nativeEmitter.cachedBuilders.remove(element.enclosingClass);
 
       }
     }
   }
 }