Fold HTypeInfoReadVariable of instance creation.

pkg/compiler/lib/src/ssa/optimize.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.
 
 import '../common/codegen.dart' show CodegenWorkItem;
 import '../common/tasks.dart' show CompilerTask;
 import '../compiler.dart' show Compiler;
 import '../constants/constant_system.dart';
 import '../constants/values.dart';
 import '../core_types.dart' show CoreClasses;
@@ skipping 1039 matching lines @@
         HInstruction replacement = new HTypeInfoExpression(
             TypeInfoExpressionKind.COMPLETE,
             typeArgument,
             const <HInstruction>[],
             backend.dynamicType);
         return replacement;
       }
       return node;
     }
 
+    HInstruction finishSubstituted(
+        ClassElement createdClass, HInstruction select(int index)) {

[Siggi Cherem (dart-lang), 2016/08/29 19:48:57]

I'm not sure what 'select' means in this context. Could you clarify?

Alternatively, maybe rename it, for example we could directly ask callers to
provide `getInstructionForTypeVariable`

[sra1, 2016/08/29 21:27:41]

It is a 'select' because it picks an existing thing.

I renamed it to 'selectTypeArgumentFromObjectCreation'.

+      HInstruction instructionForTypeVariable(TypeVariableType tv) {
+        return select(createdClass.thisType.typeArguments.indexOf(tv));
+      }
+
+      DartType type = createdClass.thisType
+          .asInstanceOf(variable.element.enclosingClass)
+          .typeArguments[variable.element.index];
+      if (type is TypeVariableType) {
+        return instructionForTypeVariable(type);
+      }
+      List<HInstruction> arguments = <HInstruction>[];
+      type.forEachTypeVariable((v) {
+        arguments.add(instructionForTypeVariable(v));
+      });
+      HInstruction replacement = new HTypeInfoExpression(
+          TypeInfoExpressionKind.COMPLETE,
+          type,
+          arguments,
+          backend.dynamicType);
+      return replacement;
+    }
+
     // Type variable evaluated in the context of a constant can be replaced with
     // a ground term type.
     if (object is HConstant) {
       ConstantValue value = object.constant;
       if (value is ConstructedConstantValue) {
         return finishGroundType(value.type);
       }
       return node;
     }
 
-    // TODO(sra): HTypeInfoReadVariable on an instance creation can be replaced
-    // with an input of the instance creation's HTypeInfoExpression (or a
-    // HTypeInfoExpression of an input).  This would in effect store-forward the
-    // type parameters.
+    // Store-forward and index into reified type on an instance creation.
+    //
+    // Look for an allocation with type information, or allocation of a
+    // non-generic type (which extends or mixes in a generic type).
+
+    if (object is HForeignNew) {
+      return finishGroundType(object.element.thisType);
+    }
+    if (object is HInvokeStatic) {
+      if (object.element == helpers.setRuntimeTypeInfo) {
+        HInstruction allocation = object.inputs[0];
+        if (allocation is HForeignNew) {
+          HInstruction typeInfo = object.inputs[1];
+          if (typeInfo is HTypeInfoExpression) {
+            return finishSubstituted(
+                allocation.element, (int index) => typeInfo.inputs[index]);
+          }
+        }
+        return node;
+      }
+      // TODO(sra): Factory constructors pass type arguments after the value
+      // arguments. The [select] argument indexes into these type arguments.
+    }
 
     return node;
   }
 }
 
 class SsaCheckInserter extends HBaseVisitor implements OptimizationPhase {
   final Set<HInstruction> boundsChecked;
   final CodegenWorkItem work;
   final bool trustPrimitives;
   final JavaScriptBackend backend;
@@ skipping 1381 matching lines @@
 
     keyedValues.forEach((receiver, values) {
       result.keyedValues[receiver] =
           new Map<HInstruction, HInstruction>.from(values);
     });
 
     result.nonEscapingReceivers.addAll(nonEscapingReceivers);
     return result;
   }
 }