dart2js cps: Keep interceptors in a separate field.

pkg/compiler/lib/src/cps_ir/cps_fragment.dart

 // Copyright (c) 2015, 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.
 
 library cps_ir.cps_fragment;
 
 import 'cps_ir_nodes.dart';
 import '../constants/values.dart';
 import '../universe/selector.dart' show Selector;
 import '../types/types.dart' show TypeMask;
@@ skipping 114 matching lines @@
     ApplyBuiltinMethod apply =
         new ApplyBuiltinMethod(method, receiver, arguments, sourceInformation);
     return letPrim(apply);
   }
 
   /// Inserts an invocation and returns a primitive holding the returned value.
   Primitive invokeMethod(Primitive receiver,
       Selector selector,
       TypeMask mask,
       List<Primitive> arguments,
-      [CallingConvention callingConvention = CallingConvention.Normal]) {
+      {Primitive interceptor,
+       CallingConvention callingConvention}) {
     InvokeMethod invoke =
         new InvokeMethod(receiver, selector, mask, arguments,
                          sourceInformation: sourceInformation,
-                         callingConvention: callingConvention);
+                         callingConvention: callingConvention,
+                         interceptor: interceptor);
     return letPrim(invoke);
   }
 
   /// Inserts an invocation and returns a primitive holding the returned value.
   Primitive invokeStatic(FunctionElement target, List<Primitive> arguments) {
     return letPrim(new InvokeStatic(target, new Selector.fromElement(target),
         arguments, sourceInformation));
   }
 
   /// Inserts an invocation to a static function that throws an error.
@@ skipping 119 matching lines @@
   /// Inlines [target] at the current position, substituting the provided
   /// arguments.
   ///
   /// Returns a primitive containing the function's return value.
   ///
   /// The new hole is the the point after [target] has returned. The fragment
   /// remains open, even if [target] never returns.
   ///
   /// The [target] function is destroyed and should not be reused.
   Primitive inlineFunction(FunctionDefinition target,
-                           Primitive thisArgument,
+                           Primitive receiver,
                            List<Primitive> arguments,
-                           {Entity hint}) {
-    if (thisArgument != null) {
-      target.thisParameter.replaceUsesWith(thisArgument);
+                           {Entity hint,
+                            Primitive interceptor}) {
+    if (interceptor != null) {
+      target.interceptorParameter.replaceUsesWith(interceptor);
+    }
+    if (receiver != null) {
+      target.receiverParameter.replaceUsesWith(receiver);
     }
     for (int i = 0; i < arguments.length; ++i) {
       target.parameters[i].replaceUsesWith(arguments[i]);
     }
     Continuation returnCont = target.returnContinuation;
     bindContinuation(returnCont);
     put(target.body);
     Parameter returnValue = returnCont.parameters.single;
     returnValue.hint = hint;
     context = returnCont;
@@ skipping 70 matching lines @@
   while (prim.firstRef != null) {
     Refinement refine = prim.firstRef.parent;
     destroyRefinementsOfDeadPrimitive(refine);
     LetPrim letPrim = refine.parent;
     InteriorNode parent = letPrim.parent;
     parent.body = letPrim.body;
     letPrim.body.parent = parent;
     prim.firstRef.unlink();
   }
 }