Split the computation of uninstantiated type arguments between the factory case

runtime/vm/flow_graph_builder.h

 // 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.
 
 #ifndef VM_FLOW_GRAPH_BUILDER_H_
 #define VM_FLOW_GRAPH_BUILDER_H_
 
 #include "vm/allocation.h"
 #include "vm/ast.h"
 #include "vm/growable_array.h"
@@ skipping 80 matching lines @@
  protected:
   // Helpers for translating parts of the AST.
   void TranslateArgumentList(const ArgumentListNode& node,
                              intptr_t next_temp_index,
                              ZoneGrowableArray<Value*>* values);
 
   // Build the load part of a instance field increment.  Translates the
   // receiver and loads the value.  The receiver will be named with
   // start_index, the temporary index of the value is returned (always
   // start_index+1).
-  int BuildIncrOpFieldLoad(IncrOpInstanceFieldNode* node, int start_index);
+  int BuildIncrOpFieldLoad(IncrOpInstanceFieldNode* node, intptr_t start_index);
 
   // Build the load part of an indexed increment.  Translates the receiver
   // and index and loads the value.  The receiver will be named with
   // start_index, the index with start_index+1, and the temporary index of
   // the value is returned (always start_index+2).
-  int BuildIncrOpIndexedLoad(IncrOpIndexedNode* node, int start_index);
+  int BuildIncrOpIndexedLoad(IncrOpIndexedNode* node, intptr_t start_index);
 
   // Build the increment part of an increment operation (add or subtract 1).
   // The original value is expected to be named with start_index-1, and the
   // result will be named with start_index.
   void BuildIncrOpIncrement(Token::Kind kind,
                             intptr_t node_id,
                             intptr_t token_index,
-                            int start_index);
+                            intptr_t start_index);
 
-  // Creates type arguments (one or two values in 'args') used in preparation
-  // of a constructor or factory call.
-  // For factory call instantiates and returns type argument vector in 'args'.
-  // For constructor call returns type arguments and type arguments of the
-  // instantiator.
+  // Creates an instantiated type argument vector used in preparation of a
+  // factory call.
   // May be called only if allocating an object of a parameterized class.
-  void BuildTypeArguments(ConstructorCallNode* node,
-                          ZoneGrowableArray<Value*>* args);
+  Value* BuildFactoryTypeArguments(ConstructorCallNode* node,
+                                   intptr_t start_index);
+
+  // Creates a possibly uninstantiated type argument vector and the type
+  // argument vector of the instantiator (two values in 'args') used in
+  // preparation of a constructor call.
+  // May be called only if allocating an object of a parameterized class.
+  void BuildConstructorTypeArguments(ConstructorCallNode* node,
+                                     intptr_t start_index,
+                                     ZoneGrowableArray<Value*>* args);
 
   // Returns the value of the type arguments of the instantiator.
-  Value* GenerateInstantiatorTypeArguments(intptr_t token_index,
-                                           intptr_t type_arguments);
+  Value* BuildInstantiatorTypeArguments(intptr_t token_index,
+                                        intptr_t start_index);
 
   void CloseFragment() { exit_ = NULL; }
   intptr_t AllocateTempIndex() { return temp_index_++; }
 
  private:
   // Specify a computation as the final result.  Adds a Do instruction to
   // the graph, but normally overridden in subclasses.
   virtual void ReturnComputation(Computation* computation) {
     AddInstruction(new DoInstr(computation));
   }
@@ skipping 127 matching lines @@
   }
 
   // Output parameters.
   BlockEntryInstr** true_successor_address_;
   BlockEntryInstr** false_successor_address_;
 };
 
 }  // namespace dart
 
 #endif  // VM_FLOW_GRAPH_BUILDER_H_