Avoid using FunctionSignature in builder_kernel

pkg/compiler/lib/src/ssa/builder_kernel.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 '../closure.dart';
 import '../common.dart';
 import '../common/codegen.dart' show CodegenRegistry;
 import '../common/names.dart';
@@ skipping 24 matching lines @@
 import 'graph_builder.dart';
 import 'jump_handler.dart';
 import 'kernel_ast_adapter.dart';
 import 'kernel_string_builder.dart';
 import 'locals_handler.dart';
 import 'loop_handler.dart';
 import 'nodes.dart';
 import 'ssa_branch_builder.dart';
 import 'switch_continue_analysis.dart';
 import 'type_builder.dart';
-import 'types.dart' show TypeMaskFactory;
 
 class KernelSsaBuilder extends ir.Visitor with GraphBuilder {
   final ir.Node target;
   final bool _targetIsConstructorBody;
   final MemberEntity targetElement;
 
   /// The root node of [targetElement]. This is used as the key into the
   /// [startFunction] of the locals handler.
   // TODO(johnniwinther,efortuna): Avoid the need for AST nodes in the locals
   // handler.
   final Node functionNode;
   final ClosedWorld closedWorld;
   final CodegenRegistry registry;
   final ClosureClassMaps closureToClassMapper;
 
   /// Helper accessor for all kernel function-like targets (Procedure,
   /// FunctionExpression, FunctionDeclaration) of the inner FunctionNode itself.
   /// If the current target is not a function-like target, _targetFunction will
   /// be null.
   ir.FunctionNode _targetFunction;
 
   /// A stack of [ResolutionDartType]s that have been seen during inlining of
   /// factory constructors.  These types are preserved in [HInvokeStatic]s and
   /// [HCreate]s inside the inline code and registered during code generation
   /// for these nodes.
   // TODO(karlklose): consider removing this and keeping the (substituted) types
   // of the type variables in an environment (like the [LocalsHandler]).
-  final List<ResolutionDartType> currentImplicitInstantiations =
-      <ResolutionDartType>[];
+  final List<InterfaceType> currentImplicitInstantiations = <InterfaceType>[];
 
   HInstruction rethrowableException;
 
   final Compiler compiler;
 
   @override
   JavaScriptBackend get backend => compiler.backend;
 
   @override
   TreeElements get elements => astAdapter.elements;
@@ skipping 105 matching lines @@
     HInstruction result = new HBoolify(value, commonMasks.boolType);
     add(result);
     return result;
   }
 
   /// Extend current method parameters with parameters for the class type
   /// parameters.  If the class has type parameters but does not need them, bind
   /// to `dynamic` (represented as `null`) so the bindings are available for
   /// building types up the inheritance chain of generative constructors.
   void _addClassTypeVariablesIfNeeded(ir.Member constructor) {
-    var enclosing = constructor.enclosingClass;
+    ir.Class enclosing = constructor.enclosingClass;
+    ClassEntity cls = _elementMap.getClass(enclosing);
     bool needParameters;
     enclosing.typeParameters.forEach((ir.TypeParameter typeParameter) {
-      var typeParamElement = astAdapter.getElement(typeParameter);
+      TypeVariableType typeVariableType =
+          _elementMap.getDartType(new ir.TypeParameterType(typeParameter));
       HInstruction param;
-      needParameters ??= rtiNeed.classNeedsRti(_elementMap.getClass(enclosing));
+      needParameters ??= rtiNeed.classNeedsRti(cls);
       if (needParameters) {
-        param = addParameter(typeParamElement, commonMasks.nonNullType);
+        param = addParameter(typeVariableType.element, commonMasks.nonNullType);
       } else {
         // Unused, so bind to `dynamic`.
         param = graph.addConstantNull(closedWorld);
       }
-      // This is a little bit wacky (and n^2) until we make the localsHandler
-      // take Kernel DartTypes instead of just the AST DartTypes.
-      ClassElement cls = _elementMap.getClass(enclosing);
-      ResolutionTypeVariableType typeVariableType = cls.typeVariables
-          .firstWhere(
-              (ResolutionTypeVariableType i) => i.name == typeParameter.name);
       localsHandler.directLocals[
           localsHandler.getTypeVariableAsLocal(typeVariableType)] = param;
     });
   }
 
+  /// Comparator for the canonical order or named arguments.
+  int namedOrdering(ir.VariableDeclaration a, ir.VariableDeclaration b) {
+    return a.name.compareTo(b.name);
+  }
+
   /// Builds a generative constructor.
   ///
   /// Generative constructors are built in stages, in effect inlining the
   /// initializers and constructor bodies up the inheritance chain.
   ///
   ///  1. Extend method parameters with parameters the class's type parameters.
   ///
   ///  2. Add type checks for value parameters (might need result of (1)).
   ///
   ///  3. Walk inheritance chain to build bindings for type parameters of
@@ skipping 85 matching lines @@
       List<HInstruction> bodyCallInputs = <HInstruction>[];
       bodyCallInputs.add(newObject);
 
       // Pass uncaptured arguments first, captured arguments in a box, then type
       // arguments.
 
       ConstructorElement constructorElement = _elementMap.getConstructor(body);
       ClosureClassMap parameterClosureData =
           closureToClassMapper.getMemberMap(constructorElement);
 
-      var functionSignature = astAdapter.getFunctionSignature(body.function);
-      // Provide the parameters to the generative constructor body.
-      functionSignature.orderedForEachParameter((ParameterElement parameter) {
+      void handleParameter(ir.VariableDeclaration node) {
+        Local parameter = _localsMap.getLocal(node);
         // If [parameter] is boxed, it will be a field in the box passed as the
         // last parameter. So no need to directly pass it.
         if (!localsHandler.isBoxed(parameter)) {
           bodyCallInputs.add(localsHandler.readLocal(parameter));
         }
-      });
+      }
+
+      // Provide the parameters to the generative constructor body.
+      body.function.positionalParameters.forEach(handleParameter);
+      body.function.namedParameters.toList()
+        ..sort(namedOrdering)
+        ..forEach(handleParameter);
 
       // If there are locals that escape (i.e. mutated in closures), we pass the
       // box to the constructor.
       ClosureScope scopeData = parameterClosureData
           .capturingScopes[constructorElement.resolvedAst.node];
       if (scopeData != null) {
         bodyCallInputs.add(localsHandler.readLocal(scopeData.boxElement));
       }
 
       // Pass type arguments.
@@ skipping 107 matching lines @@
       assert(
           _elementMap.getClass(constructor.enclosingClass) ==
               _elementMap.commonElements.objectClass,
           'All constructors should have super- or redirecting- initializers,'
           ' except Object()');
     }
   }
 
   List<HInstruction> _normalizeAndBuildArguments(
       ir.FunctionNode function, ir.Arguments arguments) {
-    var signature = astAdapter.getFunctionSignature(function);
     var builtArguments = <HInstruction>[];
     var positionalIndex = 0;
-    signature.forEachRequiredParameter((_) {
-      arguments.positional[positionalIndex++].accept(this);
-      builtArguments.add(pop());
+    function.positionalParameters.forEach((ir.VariableDeclaration node) {
+      if (positionalIndex < arguments.positional.length) {
+        arguments.positional[positionalIndex++].accept(this);
+        builtArguments.add(pop());
+      } else {
+        ConstantValue constantValue =
+            _elementMap.getConstantValue(node.initializer, implicitNull: true);
+        assert(
+            constantValue != null,
+            failedAt(_elementMap.getMethod(function.parent),
+                'No constant computed for $node'));
+        builtArguments.add(graph.addConstant(constantValue, closedWorld));
+      }
     });
-    if (!signature.optionalParametersAreNamed) {
-      signature.forEachOptionalParameter((ParameterElement element) {
-        if (positionalIndex < arguments.positional.length) {
-          arguments.positional[positionalIndex++].accept(this);
-          builtArguments.add(pop());
-        } else {
-          var constantValue = constants.getConstantValue(element.constant);
-          assert(constantValue != null,
-              failedAt(element, 'No constant computed for $element'));
-          builtArguments.add(graph.addConstant(constantValue, closedWorld));
-        }
-      });
-    } else {
-      signature.orderedOptionalParameters.forEach((ParameterElement element) {
-        var correspondingNamed = arguments.named.firstWhere(
-            (named) => named.name == element.name,
-            orElse: () => null);
+    function.namedParameters.toList()
+      ..sort(namedOrdering)
+      ..forEach((ir.VariableDeclaration node) {
+        var correspondingNamed = arguments.named
+            .firstWhere((named) => named.name == node.name, orElse: () => null);
         if (correspondingNamed != null) {
           correspondingNamed.value.accept(this);
           builtArguments.add(pop());
         } else {
-          var constantValue = constants.getConstantValue(element.constant);
-          assert(constantValue != null,
-              failedAt(element, 'No constant computed for $element'));
+          ConstantValue constantValue = _elementMap
+              .getConstantValue(node.initializer, implicitNull: true);
+          assert(
+              constantValue != null,
+              failedAt(_elementMap.getMethod(function.parent),
+                  'No constant computed for $node'));
           builtArguments.add(graph.addConstant(constantValue, closedWorld));
         }
       });
-    }
 
     return builtArguments;
   }
 
   /// Creates localsHandler bindings for type parameters of a Supertype.
   void _bindSupertypeTypeParameters(ir.Supertype supertype) {
     ir.Class cls = supertype.classNode;
     var parameters = cls.typeParameters;
     var arguments = supertype.typeArguments;
     assert(arguments.length == parameters.length);
@@ skipping 60 matching lines @@
         initializer, target, arguments, constructorChain, fieldValues, caller);
   }
 
   void _inlineSuperOrRedirectCommon(
       ir.Initializer initializer,
       ir.Constructor constructor,
       List<HInstruction> arguments,
       List<ir.Constructor> constructorChain,
       Map<FieldEntity, HInstruction> fieldValues,
       ir.Constructor caller) {
-    var signature = astAdapter.getFunctionSignature(constructor.function);
     var index = 0;
-    signature.orderedForEachParameter((ParameterElement parameter) {
+    void handleParameter(ir.VariableDeclaration node) {
+      Local parameter = _localsMap.getLocal(node);
       HInstruction argument = arguments[index++];
       // Because we are inlining the initializer, we must update
       // what was given as parameter. This will be used in case
       // there is a parameter check expression in the initializer.
       parameters[parameter] = argument;
       localsHandler.updateLocal(parameter, argument);
-    });
+    }
+
+    constructor.function.positionalParameters.forEach(handleParameter);
+    constructor.function.namedParameters.toList()
+      ..sort(namedOrdering)
+      ..forEach(handleParameter);
 
     // Set the locals handler state as if we were inlining the constructor.
     ConstructorElement astElement = _elementMap.getConstructor(constructor);
     ResolvedAst resolvedAst = astElement.resolvedAst;
     ClosureClassMap oldClosureData = localsHandler.closureData;
     ClosureClassMap newClosureData =
         closureToClassMapper.getMemberMap(astElement);
     localsHandler.closureData = newClosureData;
     if (resolvedAst.kind == ResolvedAstKind.PARSED) {
       localsHandler.enterScope(resolvedAst.node,
@@ skipping 1336 matching lines @@
 
     // If runtime type information is needed and the map literal has no type
     // parameters, 'constructor' is a static function that forwards the call to
     // the factory constructor without type parameters.
     assert(constructor.isFunction ||
         (constructor is ConstructorEntity && constructor.isFactoryConstructor));
 
     // The instruction type will always be a subtype of the mapLiteralClass, but
     // type inference might discover a more specific type, or find nothing (in
     // dart2js unit tests).
+
     TypeMask mapType = new TypeMask.nonNullSubtype(
         _commonElements.mapLiteralClass, closedWorld);
-    TypeMask returnTypeMask = TypeMaskFactory.inferredReturnTypeForElement(
-        constructor, globalInferenceResults);
+    TypeMask returnTypeMask = _typeInferenceMap.getReturnTypeOf(constructor);
     TypeMask instructionType =
         mapType.intersection(returnTypeMask, closedWorld);
 
     addImplicitInstantiation(type);
     _pushStaticInvocation(constructor, inputs, instructionType);
     removeImplicitInstantiation(type);
   }
 
   @override
   void visitMapEntry(ir.MapEntry mapEntry) {
@@ skipping 270 matching lines @@
 
   void _addTypeArguments(List<HInstruction> values, ir.Arguments arguments) {
     // need to translate type to
     for (ir.DartType type in arguments.types) {
       values.add(typeBuilder.analyzeTypeArgument(
           _elementMap.getDartType(type), sourceElement));
     }
   }
 
   HInstruction _defaultValueForParameter(ir.VariableDeclaration parameter) {
-    ir.Expression initializer = parameter.initializer;
-    if (initializer == null) return graph.addConstantNull(closedWorld);
-    // TODO(sra): Evaluate constant in ir.Node domain.
-    ConstantValue constant = _elementMap.getConstantValue(initializer);
-    if (constant == null) return graph.addConstantNull(closedWorld);
+    ConstantValue constant =
+        _elementMap.getConstantValue(parameter.initializer, implicitNull: true);
+    assert(constant != null, failedAt(CURRENT_ELEMENT_SPANNABLE));
     return graph.addConstant(constant, closedWorld);
   }
 
   @override
   void visitStaticInvocation(ir.StaticInvocation invocation) {
     ir.Procedure target = invocation.target;
     if (_elementMap.isForeignLibrary(target.enclosingLibrary)) {
       handleInvokeStaticForeign(invocation, target);
       return;
     }
@@ skipping 477 matching lines @@
     List<HInstruction> inputs = _visitPositionalArguments(invocation.arguments);
     push(new HStringConcat(inputs[0], inputs[1], commonMasks.stringType));
   }
 
   void _pushStaticInvocation(
       MemberEntity target, List<HInstruction> arguments, TypeMask typeMask) {
     HInvokeStatic instruction = new HInvokeStatic(target, arguments, typeMask,
         targetCanThrow: !closedWorld.getCannotThrow(target));
     if (currentImplicitInstantiations.isNotEmpty) {
       instruction.instantiatedTypes =
-          new List<ResolutionInterfaceType>.from(currentImplicitInstantiations);
+          new List<InterfaceType>.from(currentImplicitInstantiations);
     }
     instruction.sideEffects = closedWorld.getSideEffectsOfElement(target);
 
     push(instruction);
   }
 
   void _pushDynamicInvocation(
       ir.Node node, TypeMask mask, List<HInstruction> arguments,
       {Selector selector}) {
     HInstruction receiver = arguments.first;
@@ skipping 667 matching lines @@
     enterBlock.setBlockFlow(
         new HTryBlockInformation(
             kernelBuilder.wrapStatementGraph(bodyGraph),
             exception,
             kernelBuilder.wrapStatementGraph(catchGraph),
             kernelBuilder.wrapStatementGraph(finallyGraph)),
         exitBlock);
     kernelBuilder.inTryStatement = previouslyInTryStatement;
   }
 }