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

sdk/lib/_internal/compiler/implementation/ssa/builder.dart

Index: sdk/lib/_internal/compiler/implementation/ssa/builder.dart
===================================================================
--- sdk/lib/_internal/compiler/implementation/ssa/builder.dart	(revision 15541)
+++ sdk/lib/_internal/compiler/implementation/ssa/builder.dart	(working copy)
@@ -2620,13 +2620,20 @@
 
     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);
@@ -3513,9 +3520,16 @@
             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);