Revert r16032: it revealed a bug in our bailout environment computation.

sdk/lib/_internal/compiler/implementation/ssa/optimize.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.
 
 part of ssa;
 
 abstract class OptimizationPhase {
   String get name;
   void visitGraph(HGraph graph);
 }
@@ skipping 188 matching lines @@
     HInstruction operand = node.operand;
     if (operand is HConstant) {
       UnaryOperation operation = node.operation(constantSystem);
       HConstant receiver = operand;
       Constant folded = operation.fold(receiver.constant);
       if (folded != null) return graph.addConstant(folded);
     }
     return node;
   }
 
-  HInstruction handleInterceptorCall(HInvokeDynamicMethod node) {
+  HInstruction handleInterceptorCall(HInvokeDynamic node) {
+    if (node is !HInvokeDynamicMethod) return null;
     HInstruction input = node.inputs[1];
     if (input.isString(types)
         && node.selector.name == const SourceString('toString')) {
       return node.inputs[1];
     }
     // Check if this call does not need to be intercepted.
     HType type = types[input];
     var interceptor = node.inputs[0];
     if (interceptor is !HThis && !type.canBePrimitive()) {
       // If the type can be null, and the intercepted method can be in
       // the object class, keep the interceptor.
       if (type.canBeNull()
           && interceptor.interceptedClasses.contains(compiler.objectClass)) {
         return node;
       }
       // Change the call to a regular invoke dynamic call.
       return new HInvokeDynamicMethod(
           node.selector, node.inputs.getRange(1, node.inputs.length - 1));
     }
 
     Selector selector = node.selector;
-
-    if (node.isIndexOperatorOnIndexablePrimitive(types)) {
-      return new HIndex(node.inputs[1], node.inputs[2]);
-    }
-
     SourceString selectorName = selector.name;
     Element target;
     if (input.isExtendableArray(types)) {
       if (selectorName == backend.jsArrayRemoveLast.name
           && selector.argumentCount == 0) {
         target = backend.jsArrayRemoveLast;
       } else if (selectorName == backend.jsArrayAdd.name
                  && selector.argumentCount == 1
                  && selector.namedArgumentCount == 0
                  && !compiler.enableTypeAssertions) {
@@ skipping 28 matching lines @@
         && node.inputs[1].isInteger(types);
   }
 
   HInstruction visitInvokeStatic(HInvokeStatic node) {
     if (isFixedSizeListConstructor(node)) {
       node.guaranteedType = HType.FIXED_ARRAY;
     }
     return node;
   }
 
-  HInstruction visitInvokeDynamicMethod(HInvokeDynamicMethod node) {
+  HInstruction visitInvokeDynamic(HInvokeDynamic node) {
     if (node.isInterceptorCall) return handleInterceptorCall(node);
     HType receiverType = types[node.receiver];
     if (receiverType.isExact()) {
       HBoundedType type = receiverType;
       Element element = type.lookupMember(node.selector.name);
       // TODO(ngeoffray): Also fold if it's a getter or variable.
       if (element != null && element.isFunction()) {
         if (node.selector.applies(element, compiler)) {
           FunctionElement method = element;
           FunctionSignature parameters = method.computeSignature(compiler);
           if (parameters.optionalParameterCount == 0) {
             node.element = element;
           }
           // TODO(ngeoffray): If the method has optional parameters,
           // we should pass the default values here.
         }
       }
     }
     return node;
   }
 
   /**
    * Turns a primitive instruction (e.g. [HIndex], [HAdd], ...) into a
    * [HInvokeDynamic] because we know the receiver is not a JS
    * primitive object.
    */
-  HInstruction fromPrimitiveInstructionToDynamicInvocation(HInstruction node,
+  HInstruction fromPrimitiveInstructionToDynamicInvocation(HInvokeStatic node,
                                                            Selector selector) {
     HBoundedType type = types[node.inputs[1]];
     HInvokeDynamicMethod result = new HInvokeDynamicMethod(
         selector,
         node.inputs.getRange(1, node.inputs.length - 1));
     if (type.isExact()) {
       HBoundedType concrete = type;
       result.element = concrete.lookupMember(selector.name);
     }
     return result;
   }
 
   HInstruction visitIntegerCheck(HIntegerCheck node) {
     HInstruction value = node.value;
     if (value.isInteger(types)) return value;
     if (value.isConstant()) {
       HConstant constantInstruction = value;
       assert(!constantInstruction.constant.isInt());
       if (!constantSystem.isInt(constantInstruction.constant)) {
         // -0.0 is a double but will pass the runtime integer check.
         node.alwaysFalse = true;
       }
     }
     return node;
   }
 
+
+  HInstruction visitIndex(HIndex node) {
+    if (!node.receiver.canBePrimitive(types)) {
+      Selector selector = new Selector.index();
+      return fromPrimitiveInstructionToDynamicInvocation(node, selector);
+    }
+    return node;
+  }
+
   HInstruction visitIndexAssign(HIndexAssign node) {
     if (!node.receiver.canBePrimitive(types)) {
       Selector selector = new Selector.indexSet();
       return fromPrimitiveInstructionToDynamicInvocation(node, selector);
     }
     return node;
   }
 
   HInstruction visitInvokeBinary(HInvokeBinary node) {
     HInstruction left = node.left;
@@ skipping 443 matching lines @@
     HIntegerCheck check = new HIntegerCheck(value);
     node.block.addBefore(node, check);
     Set<HInstruction> dominatedUsers = value.dominatedUsers(node);
     for (HInstruction user in dominatedUsers) {
       user.changeUse(value, check);
     }
     return check;
   }
 
   void visitIndex(HIndex node) {
+    if (!node.receiver.isIndexablePrimitive(types)) return;
     if (boundsChecked.contains(node)) return;
     HInstruction index = node.index;
     if (!node.index.isInteger(types)) {
       index = insertIntegerCheck(node, index);
     }
     index = insertBoundsCheck(node, node.receiver, index);
     node.changeUse(node.index, index);
+    assert(node.isBuiltin(types));
   }
 
   void visitIndexAssign(HIndexAssign node) {
     if (!node.receiver.isMutableArray(types)) return;
     if (boundsChecked.contains(node)) return;
     HInstruction index = node.index;
     if (!node.index.isInteger(types)) {
       index = insertIntegerCheck(node, index);
     }
     index = insertBoundsCheck(node, node.receiver, index);
@@ skipping 652 matching lines @@
     HInstruction receiver = interceptor.receiver;
     for (var user in receiver.usedBy) {
       if (user is HInterceptor && interceptor.dominates(user)) {
         user.interceptedClasses = interceptor.interceptedClasses;
       }
     }
   }
 
   // TODO(ngeoffray): Also implement it for non-intercepted calls.
 }