Inline the fixed array constructor manually in the SSA builder. Also track whether a fixed array ev…

sdk/lib/_internal/compiler/implementation/ssa/builder.dart

 // Copyright (c) 2012, 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;
 
 /**
  * A special element for the extra parameter taken by intercepted
  * methods. We need to override [Element.computeType] because our
  * optimizers may look at its declared type.
@@ skipping 3782 matching lines @@
         null,
         typeInfoSetterElement,
         <HInstruction>[newObject, typeInfo],
         backend.dynamicType);
     pop();
   }
 
   handleNewSend(NewExpression node) {
     Send send = node.send;
     bool isFixedList = false;
+    bool isFixedListConstructorCall =
+        Elements.isFixedListConstructorCall(elements[send], send, compiler);
 
     TypeMask computeType(element) {
       Element originalElement = elements[send];
-      if (Elements.isFixedListConstructorCall(originalElement, send, compiler)
+      if (isFixedListConstructorCall
           || Elements.isFilledListConstructorCall(
                   originalElement, send, compiler)) {
         isFixedList = true;
         TypeMask inferred =
             TypeMaskFactory.inferredForNode(currentElement, send, compiler);
         return inferred.containsAll(compiler)
             ? backend.fixedArrayType
             : inferred;
       } else if (Elements.isGrowableListConstructorCall(
                     originalElement, send, compiler)) {
@@ skipping 54 matching lines @@
     // TODO(5347): Try to avoid the need for calling [implementation] before
     // calling [addStaticSendArgumentsToList].
     bool succeeded = addStaticSendArgumentsToList(selector, send.arguments,
                                                   constructor.implementation,
                                                   inputs);
     if (!succeeded) {
       generateWrongArgumentCountError(send, constructor, send.arguments);
       return;
     }
 
-    ClassElement cls = constructor.getEnclosingClass();
-    if (cls.isAbstract && constructor.isGenerativeConstructor()) {
-      generateAbstractClassInstantiationError(send, cls.name);
-      return;
-    }
-    if (backend.classNeedsRti(cls)) {
-      Link<DartType> typeVariable = cls.typeVariables;
-      expectedType.typeArguments.forEach((DartType argument) {
-        inputs.add(analyzeTypeArgument(argument));
-        typeVariable = typeVariable.tail;
-      });
-      assert(typeVariable.isEmpty);
-    }
-
     if (constructor.isFactoryConstructor() &&
         !expectedType.typeArguments.isEmpty) {
       compiler.enqueuer.codegen.registerFactoryWithTypeArguments(elements);
     }
+
     TypeMask elementType = computeType(constructor);
-    addInlinedInstantiation(expectedType);
-    pushInvokeStatic(node, constructor, inputs, elementType);
-    removeInlinedInstantiation(expectedType);
+    if (isFixedListConstructorCall) {
+      if (!inputs[0].isNumber(compiler)) {
+        HTypeConversion conversion = new HTypeConversion(
+          null, HTypeConversion.ARGUMENT_TYPE_CHECK, backend.numType,
+          inputs[0], null);
+        add(conversion);
+        inputs[0] = conversion;
+      }
+      js.Expression code = js.js.parseForeignJS('new Array(#)');

[kasperl, 2013/11/25 08:16:44]

You can get rid of new here.

[ngeoffray, 2013/11/25 08:33:31]

Done.

+      var behavior = new native.NativeBehavior();
+      behavior.typesReturned.add(expectedType);
+      // The allocation can throw only if the given length is a double
+      // or negative.
+      HForeign foreign = new HForeign(
+          code, elementType, inputs, nativeBehavior: behavior, canThrow: true);

[kasperl, 2013/11/25 08:16:44]

If you know something about the length (positive int) then maybe canThrow should
be false?

[ngeoffray, 2013/11/25 08:33:31]

Done.

+      push(foreign);
+      TypesInferrer inferrer = compiler.typesTask.typesInferrer;
+      if (inferrer.isFixedArrayCheckedForGrowable(send)) {
+        js.Expression code = js.js.parseForeignJS('#.fixed\$length = init');

[kasperl, 2013/11/25 08:16:44]

Use raw string instead of escaping $?

Since you have this code here now, does it still have to be in the JS helper
libraries?

[ngeoffray, 2013/11/25 08:33:31]

Done.
No, but if we go that route, I'd prefer making the List constructor be a no-op.
I plan on recognizing growable list implemenations here as well.

+        // We have to put a dummy side effect to avoid this
+        // instruction being dead code. We need a finer grain side

[kasperl, 2013/11/25 08:16:44]

grain -> grained

[ngeoffray, 2013/11/25 08:33:31]

Done.

+        // effect.
+        SideEffects effects = new SideEffects.empty();
+        effects.setChangesInstanceProperty();
+        add(new HForeign(
+              code, backend.nullType, [stack.last], effects: effects));
+      }
+    } else {
+      ClassElement cls = constructor.getEnclosingClass();
+      if (cls.isAbstract && constructor.isGenerativeConstructor()) {
+        generateAbstractClassInstantiationError(send, cls.name);
+        return;
+      }
+      if (backend.classNeedsRti(cls)) {
+        Link<DartType> typeVariable = cls.typeVariables;
+        expectedType.typeArguments.forEach((DartType argument) {
+          inputs.add(analyzeTypeArgument(argument));
+          typeVariable = typeVariable.tail;
+        });
+        assert(typeVariable.isEmpty);
+      }
+
+      addInlinedInstantiation(expectedType);
+      pushInvokeStatic(node, constructor, inputs, elementType);
+      removeInlinedInstantiation(expectedType);
+    }
     HInstruction newInstance = stack.last;
-
     if (isFixedList) {
       JavaScriptItemCompilationContext context = work.compilationContext;
       context.allocatedFixedLists.add(newInstance);
     }
 
     // The List constructor forwards to a Dart static method that does
     // not know about the type argument. Therefore we special case
     // this constructor to have the setRuntimeTypeInfo called where
     // the 'new' is done.
-    if (isJSArrayTypedConstructor &&
+    if ((isFixedListConstructorCall || isJSArrayTypedConstructor) &&
         backend.classNeedsRti(compiler.listClass)) {
       handleListConstructor(type, send, newInstance);
     }
 
     // Finally, if we called a redirecting factory constructor, check the type.
     if (isRedirected) {
       HInstruction checked = potentiallyCheckType(newInstance, type);
       if (checked != newInstance) {
         pop();
         stack.add(checked);
@@ skipping 1979 matching lines @@
           new HSubGraphBlockInformation(elseBranch.graph));
 
     HBasicBlock conditionStartBlock = conditionBranch.block;
     conditionStartBlock.setBlockFlow(info, joinBlock);
     SubGraph conditionGraph = conditionBranch.graph;
     HIf branch = conditionGraph.end.last;
     assert(branch is HIf);
     branch.blockInformation = conditionStartBlock.blockFlow;
   }
 }