Split TypedSelector into Selector and TypeMask.

pkg/compiler/lib/src/ssa/interceptor_simplifier.dart

 // Copyright (c) 2013, 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;
 
 /**
  * This phase simplifies interceptors in multiple ways:
  *
  * 1) If the interceptor is for an object whose type is known, it
@@ skipping 329 matching lines @@
           return replaceUserWith(instanceofCheck);
         }
       }
     } else if (user is HInvokeDynamic) {
       if (node == user.inputs[0]) {
         // Replace the user with a [HOneShotInterceptor].
         HConstant nullConstant = graph.addConstantNull(compiler);
         List<HInstruction> inputs = new List<HInstruction>.from(user.inputs);
         inputs[0] = nullConstant;
         HOneShotInterceptor oneShotInterceptor = new HOneShotInterceptor(
-            user.selector, inputs, user.instructionType, interceptedClasses);
+            user.selector, user.mask,
+            inputs, user.instructionType, interceptedClasses);
         oneShotInterceptor.sourceInformation = user.sourceInformation;
         oneShotInterceptor.sourceElement = user.sourceElement;
         return replaceUserWith(oneShotInterceptor);
       }
     }
 
     return false;
   }
 
   bool rewriteToUseSelfAsInterceptor(HInterceptor node, HInstruction receiver) {
@@ skipping 12 matching lines @@
     return false;
   }
 
   bool visitOneShotInterceptor(HOneShotInterceptor node) {
     HInstruction constant = tryComputeConstantInterceptor(
         node.inputs[1], node.interceptedClasses);
 
     if (constant == null) return false;
 
     Selector selector = node.selector;
+    TypeMask mask = node.mask;
     HInstruction instruction;
     if (selector.isGetter) {
       instruction = new HInvokeDynamicGetter(
           selector,
+          mask,
           node.element,
           <HInstruction>[constant, node.inputs[1]],
           node.instructionType);
     } else if (selector.isSetter) {
       instruction = new HInvokeDynamicSetter(
           selector,
+          mask,
           node.element,
           <HInstruction>[constant, node.inputs[1], node.inputs[2]],
           node.instructionType);
     } else {
       List<HInstruction> inputs = new List<HInstruction>.from(node.inputs);
       inputs[0] = constant;
       instruction = new HInvokeDynamicMethod(
-          selector, inputs, node.instructionType, true);
+          selector, mask, inputs, node.instructionType, true);
     }
 
     HBasicBlock block = node.block;
     block.addAfter(node, instruction);
     block.rewrite(node, instruction);
     return true;
   }
 }