Revert "Rename [call$...] properties to [$...] in compiled code."

sdk/lib/_internal/compiler/implementation/js_backend/namer.dart

 // Copyright (c) 2011, 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 js_backend;
 
 /**
  * Assigns JavaScript identifiers to Dart variables, class-names and members.
  */
 class Namer implements ClosureNamer {
@@ skipping 203 matching lines @@
       assert(reservedGlobalObjectNames.length == 25);
       _jsVariableReserved.addAll(reservedGlobalHelperFunctions);
     }
     return _jsVariableReserved;
   }
 
   final String currentIsolate = r'$';
   final String getterPrefix = r'get$';
   final String setterPrefix = r'set$';
   final String metadataField = '@';
-  final String callPrefix = 'call';
   final String callCatchAllName = r'call$catchAll';
   final String reflectableField = r'$reflectable';
   final String defaultValuesField = r'$defaultValues';
   final String methodsWithOptionalArgumentsField =
       r'$methodsWithOptionalArguments';
 
   final String classDescriptorProperty = r'^';
 
   // Name of property in a class description for the native dispatch metadata.
   final String nativeSpecProperty = '%';
@@ skipping 49 matching lines @@
    * [STATIC_CLOSURE_NAME_NAME].
    */
   String get STATIC_CLOSURE_NAME_NAME => r'$name';
   String get closureInvocationSelectorName => Compiler.CALL_OPERATOR_NAME;
   bool get shouldMinify => false;
 
   String getNameForJsGetName(Node node, String name) {
     switch (name) {
       case 'GETTER_PREFIX': return getterPrefix;
       case 'SETTER_PREFIX': return setterPrefix;
-      case 'CALL_PREFIX': return callPrefix;
       case 'CALL_CATCH_ALL': return callCatchAllName;
       case 'REFLECTABLE': return reflectableField;
       case 'CLASS_DESCRIPTOR_PROPERTY': return classDescriptorProperty;
       default:
         compiler.reportError(
             node, MessageKind.GENERIC,
             {'text': 'Error: Namer has no name for "$name".'});
         return 'BROKEN';
     }
   }
@@ skipping 73 matching lines @@
     // Selector.fromElement(element))?
     String elementName = element.name;
     String name = operatorNameToIdentifier(elementName);
     if (name != elementName) return getMappedOperatorName(name);
 
     LibraryElement library = element.getLibrary();
     if (element.isGenerativeConstructorBody()) {
       name = Elements.reconstructConstructorNameSourceString(element);
     }
     FunctionSignature signature = element.functionSignature;
-    // We don't mangle the closure invoking function name because it
-    // is generated by string concatenation in applyFunction from
-    // js_helper.dart. To keep code size down, we potentially shorten
-    // the prefix though.
-    String methodName;
-    if (name == closureInvocationSelectorName) {
-      methodName = '$callPrefix\$${signature.parameterCount}';
-    } else {
-      methodName = '${privateName(library, name)}\$${signature.parameterCount}';
-    }
+    String methodName =
+        '${privateName(library, name)}\$${signature.parameterCount}';
     if (signature.optionalParametersAreNamed &&
         !signature.optionalParameters.isEmpty) {
       StringBuffer buffer = new StringBuffer();
       signature.orderedOptionalParameters.forEach((Element element) {
         buffer.write('\$${safeName(element.name)}');
       });
       methodName = '$methodName$buffer';
     }
     if (name == closureInvocationSelectorName) return methodName;
     return getMappedInstanceName(methodName);
   }
 
   String publicInstanceMethodNameByArity(String name, int arity) {
     String newName = operatorNameToIdentifier(name);
     if (newName != name) return getMappedOperatorName(newName);
     assert(!isPrivateName(name));
     // We don't mangle the closure invoking function name because it
     // is generated by string concatenation in applyFunction from
-    // js_helper.dart. To keep code size down, we potentially shorten
-    // the prefix though.
-    if (name == closureInvocationSelectorName) return '$callPrefix\$$arity';
-
-    return getMappedInstanceName('$name\$$arity');
+    // js_helper.dart.
+    String proposedName = '$name\$$arity';
+    if (name == closureInvocationSelectorName) return proposedName;
+    return getMappedInstanceName(proposedName);
   }
 
   String invocationName(Selector selector) {
     if (selector.isGetter()) {
       String proposedName = privateName(selector.library, selector.name);
       return '$getterPrefix${getMappedInstanceName(proposedName)}';
     } else if (selector.isSetter()) {
       String proposedName = privateName(selector.library, selector.name);
       return '$setterPrefix${getMappedInstanceName(proposedName)}';
     } else {
       String name = selector.name;
       if (selector.kind == SelectorKind.OPERATOR
           || selector.kind == SelectorKind.INDEX) {
         name = operatorNameToIdentifier(name);
         assert(name != selector.name);
         return getMappedOperatorName(name);
       }
       assert(name == operatorNameToIdentifier(name));
       StringBuffer buffer = new StringBuffer();
       for (String argumentName in selector.getOrderedNamedArguments()) {
         buffer.write('\$${safeName(argumentName)}');
       }
       String suffix = '\$${selector.argumentCount}$buffer';
       // We don't mangle the closure invoking function name because it
       // is generated by string concatenation in applyFunction from
-      // js_helper.dart. We potentially shorten the prefix though.
+      // js_helper.dart.
       if (selector.isClosureCall()) {
-        return "$callPrefix$suffix";
+        return "$name$suffix";
       } else {
         String proposedName = privateName(selector.library, name);
         return getMappedInstanceName('$proposedName$suffix');
       }
     }
   }
 
   /**
    * Returns the internal name used for an invocation mirror of this selector.
    */
@@ skipping 937 matching lines @@
         if (!first) {
           sb.write('_');
         }
         sb.write('_');
         visit(link.head);
         first = true;
       }
     }
   }
 }