create selectors directly from method invocations in kernel -> ssa

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

 // Copyright (c) 2016, 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.
 
 import 'package:kernel/ast.dart' as ir;
 
 import '../compiler.dart';
 import '../constants/values.dart';
 import '../diagnostics/invariant.dart';
 import '../elements/elements.dart';
 import '../js_backend/js_backend.dart';
 import '../resolution/tree_elements.dart';
 import '../tree/tree.dart' as ast;
 import '../types/masks.dart';
+import '../universe/call_structure.dart';
 import '../universe/selector.dart';
 import '../universe/side_effects.dart';
 
 import 'types.dart';
 
 /// A helper class that abstracts all accesses of the AST from Kernel nodes.
 ///
 /// The goal is to remove all need for the AST from the Kernel SSA builder.
 class KernelAstAdapter {
   final JavaScriptBackend _backend;
   final ResolvedAst _resolvedAst;
   final Map<ir.Node, ast.Node> _nodeToAst;
   final Map<ir.Node, Element> _nodeToElement;
 
-  KernelAstAdapter(this._backend, this._resolvedAst, this._nodeToAst,
-      this._nodeToElement, Map<FunctionElement, ir.Member> functions) {
+  KernelAstAdapter(
+      this._backend,
+      this._resolvedAst,
+      this._nodeToAst,
+      this._nodeToElement,
+      Map<FunctionElement, ir.Member> functions,
+      Map<LibraryElement, ir.Library> libraries) {
     for (FunctionElement functionElement in functions.keys) {
       _nodeToElement[functions[functionElement]] = functionElement;
     }
+    for (LibraryElement libraryElement in libraries.keys) {
+      _nodeToElement[libraries[libraryElement]] = libraryElement;
+    }
   }
 
   Compiler get _compiler => _backend.compiler;
   TreeElements get _elements => _resolvedAst.elements;
 
   ConstantValue getConstantForSymbol(ir.SymbolLiteral node) {
     ast.Node astNode = getNode(node);
     ConstantValue constantValue = _backend.constants
         .getConstantValueForNode(astNode, _resolvedAst.elements);
     assert(invariant(astNode, constantValue != null,
@@ skipping 22 matching lines @@
     return TypeMaskFactory.inferredReturnTypeForElement(
         getElement(node), _compiler);
   }
 
   SideEffects getSideEffects(ir.Node node) {
     return _compiler.world.getSideEffectsOfElement(getElement(node));
   }
 
   // TODO(het): Create the selector directly from the invocation
   Selector getSelector(ir.MethodInvocation invocation) {
-    return _elements.getSelector(getNode(invocation));
+    SelectorKind kind = Elements.isOperatorName(invocation.name.name)
+        ? SelectorKind.OPERATOR
+        : SelectorKind.CALL;
+
+    // TODO(het): If this is a private name, include the library

[Siggi Cherem (dart-lang), 2016/08/31 17:42:36]

remove TODO? Or is this something more than what you have below?

[Harry Terkelsen, 2016/08/31 17:45:58]

Oops! I forgot to remove once I actually did it

+    Name name;
+    if (invocation.name.isPrivate) {
+      name =
+          new Name(invocation.name.name, getElement(invocation.name.library));

[Siggi Cherem (dart-lang), 2016/08/31 17:42:36]

minor style nit, consider:

ir.Name irName = invocation.name;
Name name = new Name(irName.name,
    irName.isPrivate ? getElement(originalName.library) : null);

[Harry Terkelsen, 2016/08/31 17:45:58]

Done.

+    } else {
+      name = new Name(invocation.name.name, null);
+    }
+
+    int argumentCount = invocation.arguments.positional.length +
+        invocation.arguments.named.length;
+    List<String> namedArguments =
+        invocation.arguments.named.map((e) => e.name).toList();
+    CallStructure callStructure =
+        new CallStructure(argumentCount, namedArguments);
+
+    return new Selector(kind, name, callStructure);
   }
 
   TypeMask getTypeMask(ir.MethodInvocation invocation) {
     return _elements.getTypeMask(getNode(invocation));
   }
 
   TypeMask selectorTypeOf(ir.MethodInvocation invocation) {
     return TypeMaskFactory.inferredTypeForSelector(
         getSelector(invocation), getTypeMask(invocation), _compiler);
   }
 
   bool isIntercepted(ir.MethodInvocation invocation) {
     return _backend.isInterceptedSelector(getSelector(invocation));
   }
 }