Add a getter interceptor to the new interceptor scheme. Also cleanup the "this" that turns into a r…

sdk/lib/_internal/compiler/implementation/ssa/codegen.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;
 
 class SsaCodeGeneratorTask extends CompilerTask {
 
   final JavaScriptBackend backend;
 
@@ skipping 1508 matching lines @@
     return new js.Call(new js.PropertyAccess.field(receiver, fieldName),
                        arguments);
   }
 
   // TODO(ngeoffray): Once we remove the old interceptors, we can
   // start using HInvokeInterceptor to represent interceptor calls on
   // an Interceptor class. Currently we recognize if a call is a call
   // on an interceptor by checking if the arguments in the inputs list
   // is one more than the arguments in the selector. The extra
   // argument in an interceptor call is the actual receiver.
-  bool isInterceptorCall(HInvokeDynamicMethod node) {
+  bool isInterceptorCall(HInvokeDynamic node) {
     return node.inputs.length - 1 != node.selector.argumentCount;
   }
 
   visitInvokeDynamicMethod(HInvokeDynamicMethod node) {
     use(node.receiver);
     js.Expression object = pop();
     SourceString name = node.selector.name;
     String methodName;
     List<js.Expression> arguments;
     Element target = node.element;
@@ skipping 11 matching lines @@
 
       // Register this invocation to collect the types used at all call sites.
       Selector selector = getOptimizedSelectorFor(node, node.selector);
       // TODO(ngeoffray): Remove the following restriction. Because
       // the second input of this interceptor call is the actual
       // receiver (the first is the interceptor), the backend gets
       // confused. We should pass a list of types instead of a node to
       // [registerDynamicInvocation].
       if (!isInterceptorCall(node)) {
         backend.registerDynamicInvocation(node, selector, types);
+      } else {
+        backend.addInterceptedSelector(selector);
       }
 
       // If we don't know what we're calling or if we are calling a getter,
       // we need to register that fact that we may be calling a closure
       // with the same arguments.
       if (target == null || target.isGetter()) {
         // TODO(kasperl): If we have a typed selector for the call, we
         // may know something about the types of closures that need
         // the specific closure call method.
         Selector call = new Selector.callClosureFrom(selector);
@@ skipping 10 matching lines @@
         world.registerDynamicInvocation(name, selector);
       }
     }
     push(jsPropertyCall(object, methodName, arguments), node);
   }
 
   Selector getOptimizedSelectorFor(HInvokeDynamic node,
                                    Selector defaultSelector) {
     // TODO(4434): For private members we need to use the untyped selector.
     if (defaultSelector.name.isPrivate()) return defaultSelector;
+    // TODO(ngeoffray): Type intercepted calls.
+    if (isInterceptorCall(node)) return defaultSelector;
     // If [JSInvocationMirror.invokeOn] has been called, we must not create a
     // typed selector based on the receiver type.
     if (node.element == null && // Invocation is not exact.
         backend.compiler.enabledInvokeOn) {
       return defaultSelector;
     }
     HType receiverHType = types[node.inputs[0]];
     DartType receiverType = receiverHType.computeType(compiler);
     if (receiverType != null) {
       return new TypedSelector(receiverType, defaultSelector);
@@ skipping 12 matching lines @@
     backend.addedDynamicSetter(selector, types[node.inputs[1]]);
   }
 
   visitInvokeDynamicGetter(HInvokeDynamicGetter node) {
     use(node.receiver);
     Selector getter = node.selector;
     String name = backend.namer.getterName(getter.library, getter.name);
     push(jsPropertyCall(pop(), name, visitArguments(node.inputs)), node);
     world.registerDynamicGetter(
         getter.name, getOptimizedSelectorFor(node, getter));
+    if (isInterceptorCall(node)) {
+      backend.addInterceptedSelector(getter);
+    }
   }
 
   visitInvokeClosure(HInvokeClosure node) {
     use(node.receiver);
     push(jsPropertyCall(pop(),
                         backend.namer.closureInvocationName(node.selector),
                         visitArguments(node.inputs)),
          node);
     Selector call = new Selector.callClosureFrom(node.selector);
     world.registerDynamicInvocation(call.name, call);
@@ skipping 343 matching lines @@
     HInstruction input = node.inputs[0];
     if (input.isConstantNull()) {
       pushStatement(new js.Return(null), node);
     } else {
       use(node.inputs[0]);
       pushStatement(new js.Return(pop()), node);
     }
   }
 
   visitThis(HThis node) {
-    if (backend.isInterceptorClass(work.element.getEnclosingClass())){
-      push(new js.VariableUse(variableNames.getName(node)), node);
-    } else {
-      push(new js.This());
-    }
+    push(new js.This());
   }
 
   visitThrow(HThrow node) {
     if (node.isRethrow) {
       use(node.inputs[0]);
       pushStatement(new js.Throw(pop()), node);
     } else {
       generateThrowWithHelper(r'$throw', node.inputs[0]);
     }
   }
@@ skipping 1100 matching lines @@
   if (leftType.canBeNull() && rightType.canBeNull()) {
     if (left.isConstantNull() || right.isConstantNull() ||
         (leftType.isPrimitive() && leftType == rightType)) {
       return '==';
     }
     return null;
   } else {
     return '===';
   }
 }