- Move length getter and setter interceptors to the new interceptor scheme.

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 15190)
+++ sdk/lib/_internal/compiler/implementation/ssa/builder.dart	(working copy)
@@ -2443,10 +2443,8 @@
           && send.receiver == null) {
         instruction = thisInstruction;
       } else {
-        HStatic target = new HStatic(interceptor);
-        add(target);
-        instruction = new HInvokeStatic(<HInstruction>[target, receiver]);
-        add(instruction);
+        pushInvokeInterceptor(interceptor, receiver);
+        instruction = pop();
       }
       instruction = new HInvokeDynamicGetter(
           selector, null, instruction, !hasGetter);
@@ -2454,13 +2452,6 @@
       // interceptor.
       instruction.inputs.add(receiver);
       pushWithPosition(instruction, send);
-    } else if (elements[send] == null && interceptor != null) {
-      // Use the old, deprecated interceptor mechanism.
-      HStatic target = new HStatic(interceptor);
-      add(target);
-      List<HInstruction> inputs = <HInstruction>[target, receiver];
-      pushWithPosition(new HInvokeInterceptor(selector, inputs, !hasGetter),
-                       send);
     } else {
       pushWithPosition(
           new HInvokeDynamicGetter(selector, null, receiver, !hasGetter), send);
@@ -2516,13 +2507,23 @@
     Element interceptor = getInterceptor(send, selector);
     bool hasSetter = compiler.world.hasAnyUserDefinedSetter(selector);
     if (interceptor != null && interceptor == backend.getInterceptorMethod) {
-      compiler.internalError(
-          'Unimplemented intercepted setter call with interceptor classes');
-    } else if (interceptor != null && elements[send] == null) {
-      HStatic target = new HStatic(interceptor);
-      add(target);
-      List<HInstruction> inputs = <HInstruction>[target, receiver, value];
-      addWithPosition(new HInvokeInterceptor(selector, inputs), send);
+      // If we're using an interceptor class, emit a call to the
+      // interceptor method and then the actual dynamic call on the

[ahe, 2012/11/23 06:51:23]

interceptor method -> "getInterceptor" method

[ngeoffray, 2012/11/23 12:01:17]

Done.

+      // interceptor object.
+      HInstruction instruction;
+      if (backend.isInterceptorClass(currentElement.getEnclosingClass())

[ahe, 2012/11/23 06:51:23]

Shouldn't this be part of pushInvokeInterceptor?

[ngeoffray, 2012/11/23 12:01:17]

Done.

+          && send.receiver == null) {
+        instruction = thisInstruction;
+      } else {
+        pushInvokeInterceptor(interceptor, receiver);
+        instruction = pop();
+      }
+      instruction = new HInvokeDynamicSetter(
+          selector, null, instruction, receiver, !hasSetter);
+      // Add the value as an argument to the setter call on the
+      // interceptor.
+      instruction.inputs.add(value);
+      addWithPosition(instruction, send);
     } else {
       addWithPosition(
           new HInvokeDynamicSetter(selector, null, receiver, value, !hasSetter),
@@ -2566,6 +2567,15 @@
     }
   }
 
+  void pushInvokeInterceptor(Element element, HInstruction receiver) {
+    HInstruction interceptor = new HStatic(element);
+    add(interceptor);
+    List<HInstruction> inputs = <HInstruction>[interceptor, receiver];
+    HInstruction result = new HInvokeStatic(inputs);
+    result.isSideEffectFree = true;
+    push(result);
+  }
+
   void pushInvokeHelper0(Element helper) {
     HInstruction reference = new HStatic(helper);
     add(reference);
@@ -2792,14 +2802,10 @@
           inputs.add(thisInstruction);
           inputs.add(localsHandler.readThis());
         } else {
-          HStatic target = new HStatic(interceptor);
-          add(target);
           visit(node.receiver);
           HInstruction receiver = pop();
-          HInstruction instruction =
-              new HInvokeStatic(<HInstruction>[target, receiver]);
-          add(instruction);
-          inputs.add(instruction);
+          pushInvokeInterceptor(interceptor, receiver);

[ahe, 2012/11/23 06:51:23]

Why don't you need to reuse this here?  Is it because an implicit this send
would end in a different visit method?

[ngeoffray, 2012/11/23 12:01:17]

Not sure I understand. The handling of an implicit this send is done line 2802.

+          inputs.add(pop());
           inputs.add(receiver);
         }
         addDynamicSendArgumentsToList(node, inputs);
@@ -2808,15 +2814,6 @@
         HInstruction instruction = new HInvokeDynamicMethod(selector, inputs);
         pushWithPosition(instruction, node);
         return;
-      } else if (elements[node] == null) {
-        HStatic target = new HStatic(interceptor);
-        add(target);
-        inputs.add(target);
-        visit(node.receiver);
-        inputs.add(pop());
-        addGenericSendArgumentsToList(node.arguments, inputs);
-        pushWithPosition(new HInvokeInterceptor(selector, inputs), node);
-        return;
       }
     }
 
@@ -3871,10 +3868,14 @@
       Element element = interceptors.getStaticInterceptor(selector);
       visit(node.expression);
       HInstruction receiver = pop();
-      pushInvokeHelper1(element, receiver);
-      HInstruction interceptor = pop();
-      iterator = new HInvokeDynamicMethod(
-          selector, <HInstruction>[interceptor, receiver]);
+      if (element == null) {

[ahe, 2012/11/23 06:51:23]

When can this happen?

[ngeoffray, 2012/11/23 12:01:17]

In unit tests.

+        iterator = new HInvokeDynamicMethod(selector, <HInstruction>[receiver]);
+      } else {
+        pushInvokeInterceptor(element, receiver);
+        HInvokeStatic interceptor = pop();
+        iterator = new HInvokeDynamicMethod(
+            selector, <HInstruction>[interceptor, receiver]);
+      }
       add(iterator);
     }
     HInstruction buildCondition() {