Revert "estimating parameter types" optimization due to failure on browser

lib/compiler/implementation/compiler.dart

 // Copyright (c) 2012, 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.
 
 
 /**
  * If true, print a warning for each method that was resolved, but not
  * compiled.
  */
 final bool REPORT_EXCESS_RESOLUTION = false;
@@ skipping 33 matching lines @@
   }
 
   abstract void enqueueHelpers(Enqueuer world);
   abstract CodeBuffer codegen(WorkItem work);
   abstract void processNativeClasses(Enqueuer world,
                                      Collection<LibraryElement> libraries);
   abstract void assembleProgram();
   abstract List<CompilerTask> get tasks();
 }
 
-class InvocationInfo {
-  int parameterCount;
-  List<HType> providedTypes;
-  List<Element> compiledFunctions;
-
-  InvocationInfo(List<HType> types)
-      : parameterCount = types != null ? types.length : -1,
-        providedTypes = types,
-        compiledFunctions = new List<Element>();
-
-  addCompiledFunction(FunctionElement function) =>
-      compiledFunctions.add(function);
-
-  void clearTypeInformation() => providedTypes = null;
-  bool get hasTypeInformation() => providedTypes != null;
-
-}
-
 class JavaScriptBackend extends Backend {
   SsaBuilderTask builder;
   SsaOptimizerTask optimizer;
   SsaCodeGeneratorTask generator;
   CodeEmitterTask emitter;
   final Map<Element, Map<Element, HType>> fieldInitializers;
   final Map<Element, Map<Element, HType>> fieldConstructorSetters;
   final Map<Element, Map<Element, HType>> fieldSettersType;
 
-  final Map<SourceString, Map<Selector, InvocationInfo>> invocationInfo;
-
   List<CompilerTask> get tasks() {
     return <CompilerTask>[builder, optimizer, generator, emitter];
   }
 
   JavaScriptBackend(Compiler compiler, bool generateSourceMap)
       : emitter = new CodeEmitterTask(compiler, generateSourceMap),
         fieldInitializers = new Map<Element, Map<Element, HType>>(),
         fieldConstructorSetters = new Map<Element, Map<Element, HType>>(),
         fieldSettersType = new Map<Element, Map<Element, HType>>(),
-        invocationInfo = new Map<SourceString, Map<Selector, InvocationInfo>>(),
         super(compiler) {
     builder = new SsaBuilderTask(this);
     optimizer = new SsaOptimizerTask(this);
     generator = new SsaCodeGeneratorTask(this);
   }
 
   void enqueueHelpers(Enqueuer world) {
     enqueueAllTopLevelFunctions(compiler.jsHelperLibrary, world);
     enqueueAllTopLevelFunctions(compiler.interceptorsLibrary, world);
     for (var helper in [const SourceString('Closure'),
@@ skipping 115 matching lines @@
   HType fieldSettersTypeSoFar(Element field) {
     assert(field.isField());
     assert(field.enclosingElement.isClass());
     if (!fieldSettersType.containsKey(field.enclosingElement)) {
       return HType.CONFLICTING;
     }
     Map<Element, HType> fields = fieldSettersType[field.enclosingElement];
     if (!fields.containsKey(field)) return HType.CONFLICTING;
     return fields[field];
   }
-
-  /**
-   *  Register a dynamic invocation and collect the provided types for the
-   *  named selector.
-   */
-  void registerDynamicInvocation(HInvokeDynamicMethod node, Selector selector) {
-    Map<Selector, InvocationInfo> invocationInfos =
-        invocationInfo.putIfAbsent(node.name,
-                                   () => new Map<Selector, InvocationInfo>());
-    InvocationInfo info = invocationInfos[selector];
-    if (info != null) {
-      // If we don't know anything useful about the types adding more
-      // information will not help.
-      if (!info.hasTypeInformation) return;
-
-      // Update the type information with the provided types.
-      bool typesChanged = false;
-      List<HType> types = info.providedTypes;
-      bool allUnknown = true;
-      for (int i = 0; i < types.length; i++) {
-        HType newType = types[i].union(node.inputs[i + 1].propagatedType);
-        if (newType != types[i]) {
-          typesChanged = true;
-          types[i] = newType;
-        }
-        if (types[i] != HType.UNKNOWN) allUnknown = false;
-      }
-      // If the provided types change we need to recompile all functions which
-      // have been compiled under the now invalidated assumptions.
-      if (typesChanged && info.compiledFunctions.length != 0) {
-        if (compiler.phase == Compiler.PHASE_COMPILING) {
-          info.compiledFunctions.forEach(
-              compiler.enqueuer.codegen.eagerRecompile);
-          info.compiledFunctions.clear();
-        }
-      }
-      // If all information is lost no need to keep it around.
-      if (allUnknown) info.clearTypeInformation();
-    } else {
-      // Gather the type information provided. If the types contains no useful
-      // information there is no need to actually store them.
-      bool allUnknown = true;
-      for (int i = 1; i < node.inputs.length; i++) {
-        if (node.inputs[i].propagatedType != HType.UNKNOWN) {
-          allUnknown = false;
-          break;
-        }
-      }
-      List<HType> types = null;
-      if (!allUnknown) {
-        types = new List<HType>(node.inputs.length - 1);
-        for (int i = 0; i < types.length; i++) {
-          types[i] = node.inputs[i + 1].propagatedType;
-        }
-      }
-      InvocationInfo info = new InvocationInfo(types);
-      invocationInfos[selector] = info;
-    }
-  }
-
-  /**
-   * Retreive the types of the parameters used for calling the [element]
-   * function. The types are optimistic in the sense as they are based on the
-   * possible invocations of the function seen so far. As compiling more
-   * code can invalidate this asumption the function is registered for being
-   * re-compiled if new possible invocations of this function invalidate these
-   * asumptions.
-   */
-  List<HType> optimisticParameterTypesWithRecompilationOnTypeChange(
-      FunctionElement element) {
-    Map<Selector, InvocationInfo> invocationInfos =
-        invocationInfo[element.name];
-    if (invocationInfos == null) return null;
-
-    int foundCount = 0;
-    InvocationInfo found = null;
-    invocationInfos.forEach((Selector selector, InvocationInfo info) {
-      if (selector.applies(element, compiler)) {
-        found = info;
-        foundCount++;
-      }
-    });
-
-    if (foundCount == 1 && found.hasTypeInformation) {
-      FunctionSignature signature = element.computeSignature(compiler);
-      if (signature.parameterCount == found.parameterCount) {
-        found.addCompiledFunction(element);
-        return found.providedTypes;
-      }
-    }
-    return null;
-  }
 }
 
 class Compiler implements DiagnosticListener {
   final Map<String, LibraryElement> libraries;
   int nextFreeClassId = 0;
   World world;
   String assembledCode;
   Namer namer;
   Types types;
   final bool enableTypeAssertions;
@@ skipping 884 matching lines @@
     final endOffset = end.charOffset + end.slowCharCount;
 
     // [begin] and [end] might be the same for the same empty token. This
     // happens for instance when scanning '$$'.
     assert(endOffset >= beginOffset);
     return f(beginOffset, endOffset);
   }
 
   String toString() => 'SourceSpan($uri, $begin, $end)';
 }