Move the handling of operator[] into the new interceptors.

sdk/lib/_internal/compiler/implementation/ssa/builder.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;
 
 /**
  * A special element for the extra parameter taken by intercepted
  * methods. We need to override [Element.computeType] because our
  * optimizers may look at its declared type.
@@ skipping 2602 matching lines @@
 
   visitOperatorSend(node) {
     assert(node.selector is Operator);
     if (!methodInterceptionEnabled) {
       visitDynamicSend(node);
       return;
     }
 
     Operator op = node.selector;
     if (const SourceString("[]") == op.source) {
-      HStatic target = new HStatic(interceptors.getIndexInterceptor());
-      add(target);
       visit(node.receiver);
       HInstruction receiver = pop();
       visit(node.argumentsNode);
       HInstruction index = pop();
-      push(new HIndex(target, receiver, index));
+      Selector selector = elements.getSelector(node);

[kasperl, 2012/11/30 09:23:04]

How about refactoring this? Maybe add a helper that given a selector and a
receiver (and a node) returns an input list that is either empty or contains the
result of invoking the interceptor?

Could be that the helper you really want is something that returns the
HInvokeDynamicMethod in which case you'll need to pass the index to the function
too. Long term, you may need a few variants (depending on the number of
arguments to the operator?) of this kind of helper.

[ngeoffray, 2012/11/30 13:18:14]

Done.

+      Set<ClassElement> interceptedClasses =
+          getInterceptedClassesOn(node, selector);
+      List<HInstruction> inputs = <HInstruction>[];
+      if (interceptedClasses != null) {
+        inputs.add(invokeInterceptor(interceptedClasses, receiver, node));
+      }
+      inputs.add(receiver);
+      inputs.add(index);
+      push(new HInvokeDynamicMethod(selector, inputs));
     } else if (const SourceString("&&") == op.source ||
                const SourceString("||") == op.source) {
       visitLogicalAndOr(node, op);
     } else if (const SourceString("!") == op.source) {
       visitLogicalNot(node);
     } else if (node.argumentsNode is Prefix) {
       visitUnary(node, op);
     } else if (const SourceString("is") == op.source) {
       visit(node.receiver);
       HInstruction expression = pop();
@@ skipping 866 matching lines @@
           // Compound assignments are considered as being prefix.
           bool isPrefix = !node.isPostfix;
           Element getter = elements[node.selector];
           if (isCompoundAssignment) {
             value = pop();
             index = pop();
           } else {
             index = pop();
             value = graph.addConstantInt(1, constantSystem);
           }
-          HStatic indexMethod = new HStatic(interceptors.getIndexInterceptor());
-          add(indexMethod);
-          HInstruction left = new HIndex(indexMethod, receiver, index);
+          Selector selector = new Selector.index();
+          Set<ClassElement> interceptedClasses =
+              getInterceptedClassesOn(node, selector);
+          List<HInstruction> inputs = <HInstruction>[];
+          if (interceptedClasses != null) {
+            inputs.add(invokeInterceptor(interceptedClasses, receiver, node));
+          }
+          inputs.add(receiver);
+          inputs.add(index);
+          HInstruction left = new HInvokeDynamicMethod( selector, inputs);

[kasperl, 2012/11/30 09:23:04]

Remove space before selector.

[ngeoffray, 2012/11/30 13:18:14]

Done.

           add(left);
           Element opElement = elements[op];
           visitBinary(left, op, value);
           value = pop();
           HInstruction assign = new HIndexAssign(
               target, receiver, index, value);
           add(assign);
           if (isPrefix) {
             stack.add(value);
           } else {
@@ skipping 1373 matching lines @@
           new HSubGraphBlockInformation(elseBranch.graph));
 
     HBasicBlock conditionStartBlock = conditionBranch.block;
     conditionStartBlock.setBlockFlow(info, joinBlock);
     SubGraph conditionGraph = conditionBranch.graph;
     HIf branch = conditionGraph.end.last;
     assert(branch is HIf);
     branch.blockInformation = conditionStartBlock.blockFlow;
   }
 }