Use CallStructure instead of Selector in SemanticSendVisitor.

tests/compiler/dart2js/semantic_visitor_test.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 dart2js.semantics_visitor_test;
 
 import 'dart:async';
 import 'package:async_helper/async_helper.dart';
 import 'package:expect/expect.dart';
 import 'package:compiler/src/constants/expressions.dart';
@@ skipping 157 matching lines @@
         const Visit(VisitKind.VISIT_PARAMETER_GET,
                     element: 'parameter(m#o)')),
     const Test('m(o) { o = 42; }',
         const Visit(VisitKind.VISIT_PARAMETER_SET,
                     element: 'parameter(m#o)',
                     rhs:'42')),
     const Test('m(o) { o(null, 42); }',
         const Visit(VisitKind.VISIT_PARAMETER_INVOKE,
                     element: 'parameter(m#o)',
                     arguments: '(null,42)',
-                    selector: 'Selector(call, call, arity=2)')),
+                    selector: 'CallStructure(arity=2)')),
   ],
   'Local variables': const [
     // Local variables
     const Test('m() { var o; return o; }',
         const Visit(VisitKind.VISIT_LOCAL_VARIABLE_GET,
                     element: 'variable(m#o)')),
     const Test('m() { var o; o = 42; }',
         const Visit(VisitKind.VISIT_LOCAL_VARIABLE_SET,
                     element: 'variable(m#o)',
                     rhs:'42')),
     const Test('m() { var o; o(null, 42); }',
         const Visit(VisitKind.VISIT_LOCAL_VARIABLE_INVOKE,
                     element: 'variable(m#o)',
                     arguments: '(null,42)',
-                    selector: 'Selector(call, call, arity=2)')),
+                    selector: 'CallStructure(arity=2)')),
   ],
   'Local functions': const [
     // Local functions
     const Test('m() { o(a, b) {}; return o; }',
         const Visit(VisitKind.VISIT_LOCAL_FUNCTION_GET,
                     element: 'function(m#o)')),
     const Test('m() { o(a, b) {}; o(null, 42); }',
         const Visit(VisitKind.VISIT_LOCAL_FUNCTION_INVOKE,
                     element: 'function(m#o)',
                     arguments: '(null,42)',
-                    selector: 'Selector(call, call, arity=2)')),
+                    selector: 'CallStructure(arity=2)')),
   ],
   'Static fields': const [
     // Static fields
     const Test(
         '''
         class C { static var o; }
         m() => C.o;
         ''',
         const Visit(VisitKind.VISIT_STATIC_FIELD_GET,
                     element: 'field(C#o)')),
@@ skipping 1881 matching lines @@
             constant: 'const Class(true, 42)')),
     const Test(
         '''
         class Class {}
         m() => new Class();
         ''',
         const Visit(VisitKind.VISIT_GENERATIVE_CONSTRUCTOR_INVOKE,
             element: 'generative_constructor(Class#)',
             arguments: '()',
             type: 'Class',
-            selector: 'Selector(call, , arity=0)')),
+            selector: 'CallStructure(arity=0)')),
     const Test(
         '''
         class Class {
           Class(a, b);
         }
         m() => new Class(true, 42);
         ''',
         const Visit(VisitKind.VISIT_GENERATIVE_CONSTRUCTOR_INVOKE,
             element: 'generative_constructor(Class#)',
             arguments: '(true,42)',
             type: 'Class',
-            selector: 'Selector(call, , arity=2)')),
+            selector: 'CallStructure(arity=2)')),
     const Test(
         '''
         class Class {
           Class.named(a, b);
         }
         m() => new Class.named(true, 42);
         ''',
         const Visit(VisitKind.VISIT_GENERATIVE_CONSTRUCTOR_INVOKE,
             element: 'generative_constructor(Class#named)',
             arguments: '(true,42)',
             type: 'Class',
-            selector: 'Selector(call, named, arity=2)')),
+            selector: 'CallStructure(arity=2)')),
     const Test(
         '''
         class Class {
           Class(a, b) : this._(a, b);
           Class._(a, b);
         }
         m() => new Class(true, 42);
         ''',
         const Visit(VisitKind.VISIT_REDIRECTING_GENERATIVE_CONSTRUCTOR_INVOKE,
             element: 'generative_constructor(Class#)',
             arguments: '(true,42)',
             type: 'Class',
-            selector: 'Selector(call, , arity=2)')),
+            selector: 'CallStructure(arity=2)')),
     const Test(
         '''
         class Class {
           factory Class(a, b) => new Class._(a, b);
           Class._(a, b);
         }
         m() => new Class(true, 42);
         ''',
         const Visit(VisitKind.VISIT_FACTORY_CONSTRUCTOR_INVOKE,
             element: 'function(Class#)',
             arguments: '(true,42)',
             type: 'Class',
-            selector: 'Selector(call, , arity=2)')),
+            selector: 'CallStructure(arity=2)')),
     const Test(
         '''
         class Class<T> {
           factory Class(a, b) = Class<int>.a;
           factory Class.a(a, b) = Class<Class<T>>.b;
           Class.b(a, b);
         }
         m() => new Class<double>(true, 42);
         ''',
         const Visit(VisitKind.VISIT_REDIRECTING_FACTORY_CONSTRUCTOR_INVOKE,
             element: 'function(Class#)',
             arguments: '(true,42)',
             type: 'Class<double>',
             target: 'generative_constructor(Class#b)',
             targetType: 'Class<Class<int>>',
-            selector: 'Selector(call, , arity=2)')),
+            selector: 'CallStructure(arity=2)')),
     const Test(
         '''
         class Class {
           Class(a, b);
         }
         m() => new Class.unresolved(true, 42);
         ''',
         const Visit(
             VisitKind.ERROR_UNRESOLVED_CONSTRUCTOR_INVOKE,
             arguments: '(true,42)')),
     const Test(
         '''
         m() => new Unresolved(true, 42);
         ''',
         const Visit(
             // TODO(johnniwinther): Update this to
             // `VisitKind.ERROR_UNRESOLVED_CLASS_CONSTRUCTOR_INVOKE`.
             VisitKind.ERROR_UNRESOLVED_CONSTRUCTOR_INVOKE,
             arguments: '(true,42)')),
     const Test(
         '''
         abstract class AbstractClass {}
         m() => new AbstractClass();
         ''',
         const Visit(
             VisitKind.ERROR_ABSTRACT_CLASS_CONSTRUCTOR_INVOKE,
             element: 'generative_constructor(AbstractClass#)',
             type: 'AbstractClass',
             arguments: '()',
-            selector: 'Selector(call, , arity=0)')),
+            selector: 'CallStructure(arity=0)')),
     const Test(
         '''
         class Class {
           factory Class(a, b) = Unresolved;
         }
         m() => new Class(true, 42);
         ''',
         const Visit(
             VisitKind.ERROR_UNRESOLVED_REDIRECTING_FACTORY_CONSTRUCTOR_INVOKE,
             element: 'function(Class#)',
@@ skipping 1041 matching lines @@
       arg) {
     visits.add(new Visit(VisitKind.VISIT_CLASS_TYPE_LITERAL_GET,
         constant: constant.getText()));
   }
 
   @override
   visitClassTypeLiteralInvoke(
       Send node,
       ConstantExpression constant,
       NodeList arguments,
-      Selector selector,
+      CallStructure callStructure,
       arg) {
     visits.add(new Visit(VisitKind.VISIT_CLASS_TYPE_LITERAL_INVOKE,
         constant: constant.getText(), arguments: arguments));
     apply(arguments, arg);
   }
 
   @override
   errorClassTypeLiteralSet(
       SendSet node,
       ConstantExpression constant,
@@ skipping 87 matching lines @@
       arg) {
     visits.add(new Visit(VisitKind.VISIT_DYNAMIC_TYPE_LITERAL_GET,
         constant: constant.getText()));
   }
 
   @override
   visitDynamicTypeLiteralInvoke(
       Send node,
       ConstantExpression constant,
       NodeList arguments,
-      Selector selector,
+      CallStructure callStructure,
       arg) {
     visits.add(new Visit(VisitKind.VISIT_DYNAMIC_TYPE_LITERAL_INVOKE,
         constant: constant.getText(), arguments: arguments));
   }
 
   @override
   errorDynamicTypeLiteralSet(
       Send node,
       ConstantExpression constant,
       Node rhs,
@@ skipping 67 matching lines @@
       arg) {
     visits.add(new Visit(VisitKind.VISIT_LOCAL_FUNCTION_GET,
                          element: function));
   }
 
   @override
   visitLocalFunctionInvoke(
       Send node,
       LocalFunctionElement function,
       NodeList arguments,
-      Selector selector,
+      CallStructure callStructure,
       arg) {
     visits.add(new Visit(VisitKind.VISIT_LOCAL_FUNCTION_INVOKE,
-        element: function, arguments: arguments, selector: selector));
+        element: function, arguments: arguments, selector: callStructure));
     apply(arguments, arg);
   }
 
   @override
   visitLocalVariableGet(
       Send node,
       LocalVariableElement variable,
       arg) {
     visits.add(new Visit(VisitKind.VISIT_LOCAL_VARIABLE_GET,
                          element: variable));
   }
 
   @override
   visitLocalVariableInvoke(
       Send node,
       LocalVariableElement variable,
       NodeList arguments,
-      Selector selector,
+      CallStructure callStructure,
       arg) {
     visits.add(new Visit(VisitKind.VISIT_LOCAL_VARIABLE_INVOKE,
-        element: variable, arguments: arguments, selector: selector));
+        element: variable, arguments: arguments, selector: callStructure));
     apply(arguments, arg);
   }
 
   @override
   visitLocalVariableSet(
       SendSet node,
       LocalVariableElement variable,
       Node rhs,
       arg) {
     visits.add(new Visit(VisitKind.VISIT_LOCAL_VARIABLE_SET,
         element: variable, rhs: rhs));
     apply(rhs, arg);
   }
 
   @override
   visitParameterGet(
       Send node,
       ParameterElement parameter,
       arg) {
     visits.add(new Visit(VisitKind.VISIT_PARAMETER_GET, element: parameter));
   }
 
   @override
   visitParameterInvoke(
       Send node,
       ParameterElement parameter,
       NodeList arguments,
-      Selector selector,
+      CallStructure callStructure,
       arg) {
     visits.add(new Visit(VisitKind.VISIT_PARAMETER_INVOKE,
-        element: parameter, arguments: arguments, selector: selector));
+        element: parameter, arguments: arguments, selector: callStructure));
     apply(arguments, arg);
   }
 
   @override
   visitParameterSet(
       SendSet node,
       ParameterElement parameter,
       Node rhs,
       arg) {
     visits.add(new Visit(VisitKind.VISIT_PARAMETER_SET,
                          element: parameter, rhs: rhs));
     apply(rhs, arg);
   }
 
   @override
   visitStaticFieldGet(
       Send node,
       FieldElement field,
       arg) {
     visits.add(new Visit(VisitKind.VISIT_STATIC_FIELD_GET, element: field));
   }
 
   @override
   visitStaticFieldInvoke(
       Send node,
       FieldElement field,
       NodeList arguments,
-      Selector selector,
+      CallStructure callStructure,
       arg) {
     visits.add(new Visit(VisitKind.VISIT_STATIC_FIELD_INVOKE,
         element: field, arguments: arguments));
     apply(arguments, arg);
   }
 
   @override
   visitStaticFieldSet(
       SendSet node,
       FieldElement field,
@@ skipping 11 matching lines @@
       arg) {
     visits.add(new Visit(VisitKind.VISIT_STATIC_FUNCTION_GET,
         element: function));
   }
 
   @override
   visitStaticFunctionInvoke(
       Send node,
       MethodElement function,
       NodeList arguments,
-      Selector selector,
+      CallStructure callStructure,
       arg) {
     visits.add(new Visit(VisitKind.VISIT_STATIC_FUNCTION_INVOKE,
         element: function, arguments: arguments));
     apply(arguments, arg);
   }
 
   @override
   visitStaticGetterGet(
       Send node,
       FunctionElement getter,
       arg) {
     visits.add(new Visit(VisitKind.VISIT_STATIC_GETTER_GET,
         element: getter));
   }
 
   @override
   visitStaticGetterInvoke(
       Send node,
       FunctionElement getter,
       NodeList arguments,
-      Selector selector,
+      CallStructure callStructure,
       arg) {
     visits.add(new Visit(VisitKind.VISIT_STATIC_GETTER_INVOKE,
         element: getter, arguments: arguments));
     apply(arguments, arg);
   }
 
   @override
   visitStaticSetterSet(
       SendSet node,
       FunctionElement setter,
@@ skipping 40 matching lines @@
 
   @override
   visitThisGet(Identifier node, arg) {
     visits.add(new Visit(VisitKind.VISIT_THIS_GET));
   }
 
   @override
   visitThisInvoke(
       Send node,
       NodeList arguments,
-      Selector selector,
+      CallStructure callStructure,
       arg) {
     visits.add(new Visit(VisitKind.VISIT_THIS_INVOKE, arguments: arguments));
     apply(arguments, arg);
   }
 
   @override
   visitThisPropertyGet(
       Send node,
       Selector selector,
       arg) {
@@ skipping 29 matching lines @@
       FieldElement field,
       arg) {
     visits.add(new Visit(VisitKind.VISIT_TOP_LEVEL_FIELD_GET, element: field));
   }
 
   @override
   visitTopLevelFieldInvoke(
       Send node,
       FieldElement field,
       NodeList arguments,
-      Selector selector,
+      CallStructure callStructure,
       arg) {
     visits.add(new Visit(VisitKind.VISIT_TOP_LEVEL_FIELD_INVOKE,
         element: field, arguments: arguments));
     apply(arguments, arg);
   }
 
   @override
   visitTopLevelFieldSet(
       SendSet node,
       FieldElement field,
@@ skipping 11 matching lines @@
       arg) {
     visits.add(new Visit(VisitKind.VISIT_TOP_LEVEL_FUNCTION_GET,
         element: function));
   }
 
   @override
   visitTopLevelFunctionInvoke(
       Send node,
       MethodElement function,
       NodeList arguments,
-      Selector selector,
+      CallStructure callStructure,
       arg) {
     visits.add(new Visit(VisitKind.VISIT_TOP_LEVEL_FUNCTION_INVOKE,
         element: function, arguments: arguments));
     apply(arguments, arg);
   }
 
   @override
   visitTopLevelGetterGet(
       Send node,
       FunctionElement getter,
       arg) {
     visits.add(new Visit(VisitKind.VISIT_TOP_LEVEL_GETTER_GET,
         element: getter));
   }
 
   @override
   visitTopLevelGetterInvoke(
       Send node,
       FunctionElement getter,
       NodeList arguments,
-      Selector selector,
+      CallStructure callStructure,
       arg) {
     visits.add(new Visit(VisitKind.VISIT_TOP_LEVEL_GETTER_INVOKE,
         element: getter, arguments: arguments));
     apply(arguments, arg);
   }
 
   @override
   visitTopLevelSetterSet(
       SendSet node,
       FunctionElement setter,
@@ skipping 11 matching lines @@
       arg) {
     visits.add(new Visit(VisitKind.VISIT_TYPE_VARIABLE_TYPE_LITERAL_GET,
         element: element));
   }
 
   @override
   visitTypeVariableTypeLiteralInvoke(
       Send node,
       TypeVariableElement element,
       NodeList arguments,
-      Selector selector,
+      CallStructure callStructure,
       arg) {
     visits.add(new Visit(VisitKind.VISIT_TYPE_VARIABLE_TYPE_LITERAL_INVOKE,
         element: element, arguments: arguments));
     apply(arguments, arg);
   }
 
   @override
   errorTypeVariableTypeLiteralSet(
       SendSet node,
       TypeVariableElement element,
@@ skipping 11 matching lines @@
       arg) {
     visits.add(new Visit(VisitKind.VISIT_TYPEDEF_TYPE_LITERAL_GET,
         constant: constant.getText()));
   }
 
   @override
   visitTypedefTypeLiteralInvoke(
       Send node,
       ConstantExpression constant,
       NodeList arguments,
-      Selector selector,
+      CallStructure callStructure,
       arg) {
     visits.add(new Visit(VisitKind.VISIT_TYPEDEF_TYPE_LITERAL_INVOKE,
         constant: constant.getText(), arguments: arguments));
     apply(arguments, arg);
   }
 
   @override
   errorTypedefTypeLiteralSet(
       SendSet node,
       ConstantExpression constant,
@@ skipping 30 matching lines @@
       FieldElement field,
       arg) {
     visits.add(new Visit(VisitKind.VISIT_SUPER_FIELD_GET, element: field));
   }
 
   @override
   visitSuperFieldInvoke(
       Send node,
       FieldElement field,
       NodeList arguments,
-      Selector selector,
+      CallStructure callStructure,
       arg) {
     visits.add(new Visit(VisitKind.VISIT_SUPER_FIELD_INVOKE,
         element: field, arguments: arguments));
     apply(arguments, arg);
   }
 
   @override
   visitSuperFieldSet(
       SendSet node,
       FieldElement field,
@@ skipping 10 matching lines @@
       MethodElement method,
       arg) {
     visits.add(new Visit(VisitKind.VISIT_SUPER_METHOD_GET, element: method));
   }
 
   @override
   visitSuperMethodInvoke(
       Send node,
       MethodElement method,
       NodeList arguments,
-      Selector selector,
+      CallStructure callStructure,
       arg) {
     visits.add(new Visit(VisitKind.VISIT_SUPER_METHOD_INVOKE,
         element: method, arguments: arguments));
     apply(arguments, arg);
   }
 
   @override
   visitSuperGetterGet(
       Send node,
       FunctionElement getter,
       arg) {
     visits.add(new Visit(VisitKind.VISIT_SUPER_GETTER_GET, element: getter));
   }
 
   @override
   visitSuperGetterInvoke(
       Send node,
       FunctionElement getter,
       NodeList arguments,
-      Selector selector,
+      CallStructure callStructure,
       arg) {
     visits.add(new Visit(VisitKind.VISIT_SUPER_GETTER_INVOKE,
         element: getter, arguments: arguments));
     apply(arguments, arg);
   }
 
   @override
   visitSuperSetterSet(
       SendSet node,
       FunctionElement setter,
@@ skipping 141 matching lines @@
       FunctionElement setter,
       arg) {
     // TODO: implement errorStaticSetterGet
   }
 
   @override
   errorStaticSetterInvoke(
       Send node,
       FunctionElement setter,
       NodeList arguments,
-      Selector selector,
+      CallStructure callStructure,
       arg) {
     // TODO: implement errorStaticSetterInvoke
   }
 
   @override
   errorSuperGetterSet(
       SendSet node,
       FunctionElement getter,
       Node rhs,
       arg) {
@@ skipping 15 matching lines @@
       FunctionElement setter,
       arg) {
     // TODO: implement errorSuperSetterGet
   }
 
   @override
   errorSuperSetterInvoke(
       Send node,
       FunctionElement setter,
       NodeList arguments,
-      Selector selector,
+      CallStructure callStructure,
       arg) {
     // TODO: implement errorSuperSetterInvoke
   }
 
   @override
   errorTopLevelFunctionSet(
       Send node,
       MethodElement function,
       Node rhs,
       arg) {
@@ skipping 15 matching lines @@
       FunctionElement setter,
       arg) {
     // TODO: implement errorTopLevelSetterGet
   }
 
   @override
   errorTopLevelSetterInvoke(
       Send node,
       FunctionElement setter,
       NodeList arguments,
-      Selector selector,
+      CallStructure callStructure,
       arg) {
     // TODO: implement errorTopLevelSetterInvoke
   }
 
   @override
   visitDynamicPropertyCompound(
       Send node,
       Node receiver,
       AssignmentOperator operator,
       Node rhs,
@@ skipping 744 matching lines @@
       ConstantExpression constant,
       arg) {
     // TODO: implement visitConstantGet
   }
 
   @override
   visitConstantInvoke(
       Send node,
       ConstantExpression constant,
       NodeList arguments,
-      Selector selector,
+      CallStructure callStructure,
       arg) {
     // TODO: implement visitConstantInvoke
   }
 
   @override
   errorUnresolvedCompound(
       Send node,
       ErroneousElement element,
       AssignmentOperator operator,
       Node rhs,
@@ skipping 227 matching lines @@
     visits.add(new Visit(VisitKind.VISIT_CONST_CONSTRUCTOR_INVOKE,
                          constant: constant.getText()));
   }
 
   @override
   visitFactoryConstructorInvoke(
       NewExpression node,
       ConstructorElement constructor,
       InterfaceType type,
       NodeList arguments,
-      Selector selector,
+      CallStructure callStructure,
       arg) {
     visits.add(new Visit(
         VisitKind.VISIT_FACTORY_CONSTRUCTOR_INVOKE,
         element: constructor,
         type: type,
         arguments: arguments,
-        selector: selector));
+        selector: callStructure));
     apply(arguments, arg);
   }
 
   @override
   visitGenerativeConstructorInvoke(
       NewExpression node,
       ConstructorElement constructor,
       InterfaceType type,
       NodeList arguments,
-      Selector selector,
+      CallStructure callStructure,
       arg) {
     visits.add(new Visit(
         VisitKind.VISIT_GENERATIVE_CONSTRUCTOR_INVOKE,
         element: constructor,
         type: type,
         arguments: arguments,
-        selector: selector));
+        selector: callStructure));
     apply(arguments, arg);
   }
 
   @override
   visitRedirectingFactoryConstructorInvoke(
       NewExpression node,
       ConstructorElement constructor,
       InterfaceType type,
       ConstructorElement effectiveTarget,
       InterfaceType effectiveTargetType,
       NodeList arguments,
-      Selector selector,
+      CallStructure callStructure,
       arg) {
     visits.add(new Visit(
         VisitKind.VISIT_REDIRECTING_FACTORY_CONSTRUCTOR_INVOKE,
         element: constructor,
         type: type,
         target: effectiveTarget,
         targetType: effectiveTargetType,
         arguments: arguments,
-        selector: selector));
+        selector: callStructure));
     apply(arguments, arg);
   }
 
   @override
   visitRedirectingGenerativeConstructorInvoke(
       NewExpression node,
       ConstructorElement constructor,
       InterfaceType type,
       NodeList arguments,
-      Selector selector,
+      CallStructure callStructure,
       arg) {
     visits.add(new Visit(
         VisitKind.VISIT_REDIRECTING_GENERATIVE_CONSTRUCTOR_INVOKE,
         element: constructor,
         type: type,
         arguments: arguments,
-        selector: selector));
+        selector: callStructure));
     apply(arguments, arg);
   }
 
   @override
   errorAbstractClassConstructorInvoke(
       NewExpression node,
       ConstructorElement constructor,
       InterfaceType type,
       NodeList arguments,
-      Selector selector,
+      CallStructure callStructure,
       arg) {
     visits.add(new Visit(
         VisitKind.ERROR_ABSTRACT_CLASS_CONSTRUCTOR_INVOKE,
         element: constructor,
         type: type,
         arguments: arguments,
-        selector: selector));
+        selector: callStructure));
     apply(arguments, arg);
   }
 
   @override
   errorUnresolvedRedirectingFactoryConstructorInvoke(
       NewExpression node,
       ConstructorElement constructor,
       InterfaceType type,
       NodeList arguments,
       Selector selector,
@@ skipping 523 matching lines @@
     visits.add(new Visit(VisitKind.VISIT_CONST_CONSTRUCTOR_INVOKE,
                          constant: constant.getText()));
   }
 
   @override
   visitFactoryConstructorInvoke(
       NewExpression node,
       ConstructorElement constructor,
       InterfaceType type,
       NodeList arguments,
-      Selector selector,
+      CallStructure callStructure,
       arg) {
     visits.add(new Visit(
         VisitKind.VISIT_FACTORY_CONSTRUCTOR_INVOKE,
         element: constructor,
         type: type,
         arguments: arguments,
-        selector: selector));
+        selector: callStructure));
     apply(arguments, arg);
   }
 
   @override
   visitGenerativeConstructorInvoke(
       NewExpression node,
       ConstructorElement constructor,
       InterfaceType type,
       NodeList arguments,
-      Selector selector,
+      CallStructure callStructure,
       arg) {
     visits.add(new Visit(
         VisitKind.VISIT_GENERATIVE_CONSTRUCTOR_INVOKE,
         element: constructor,
         type: type,
         arguments: arguments,
-        selector: selector));
+        selector: callStructure));
     apply(arguments, arg);
   }
 
   @override
   visitRedirectingFactoryConstructorInvoke(
       NewExpression node,
       ConstructorElement constructor,
       InterfaceType type,
       ConstructorElement effectiveTarget,
       InterfaceType effectiveTargetType,
       NodeList arguments,
-      Selector selector,
+      CallStructure callStructure,
       arg) {
     visits.add(new Visit(
         VisitKind.VISIT_REDIRECTING_FACTORY_CONSTRUCTOR_INVOKE,
         element: constructor,
         type: type,
         target: effectiveTarget,
         targetType: effectiveTargetType,
         arguments: arguments,
-        selector: selector));
+        selector: callStructure));
     apply(arguments, arg);
   }
 
   @override
   visitRedirectingGenerativeConstructorInvoke(
       NewExpression node,
       ConstructorElement constructor,
       InterfaceType type,
       NodeList arguments,
-      Selector selector,
+      CallStructure callStructure,
       arg) {
     visits.add(new Visit(
         VisitKind.VISIT_REDIRECTING_GENERATIVE_CONSTRUCTOR_INVOKE,
         element: constructor,
         type: type,
         arguments: arguments,
-        selector: selector));
+        selector: callStructure));
     apply(arguments, arg);
   }
 
   @override
   errorAbstractClassConstructorInvoke(
       NewExpression node,
       ConstructorElement constructor,
       InterfaceType type,
       NodeList arguments,
-      Selector selector,
+      CallStructure callStructure,
       arg) {
     visits.add(new Visit(
         VisitKind.ERROR_ABSTRACT_CLASS_CONSTRUCTOR_INVOKE,
         element: constructor,
         type: type,
         arguments: arguments,
-        selector: selector));
+        selector: callStructure));
     apply(arguments, arg);
   }
 
   @override
   errorUnresolvedRedirectingFactoryConstructorInvoke(
       NewExpression node,
       ConstructorElement constructor,
       InterfaceType type,
       NodeList arguments,
       Selector selector,
@@ skipping 211 matching lines @@
   VISIT_OPTIONAL_PARAMETER_DECL,
   VISIT_NAMED_PARAMETER_DECL,
   VISIT_REQUIRED_INITIALIZING_FORMAL_DECL,
   VISIT_OPTIONAL_INITIALIZING_FORMAL_DECL,
   VISIT_NAMED_INITIALIZING_FORMAL_DECL,
 
   ERROR_UNRESOLVED_POSTFIX,
 
   // TODO(johnniwinther): Add tests for more error cases.
 }