Support inlining of calls where type arguments are passed to generic functions.

runtime/vm/flow_graph.h

 // Copyright (c) 2013, 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 RUNTIME_VM_FLOW_GRAPH_H_
 #define RUNTIME_VM_FLOW_GRAPH_H_
 
 #include "vm/bit_vector.h"
 #include "vm/growable_array.h"
 #include "vm/hash_map.h"
@@ skipping 85 matching lines @@
     return parsed_function_.num_stack_locals();
   }
   intptr_t num_copied_params() const { return num_copied_params_; }
   intptr_t num_non_copied_params() const { return num_non_copied_params_; }
   bool IsIrregexpFunction() const { return function().IsIrregexpFunction(); }
 
   LocalVariable* CurrentContextVar() const {
     return parsed_function().current_context_var();
   }
 
+  LocalVariable* FunctionTypeArgsVar() const {
+    return parsed_function().function_type_arguments();
+  }
+
   intptr_t CurrentContextEnvIndex() const {
     return parsed_function().current_context_var()->BitIndexIn(
         num_non_copied_params_);
   }
 
+  intptr_t FunctionTypeArgsEnvIndex() const {
+    return parsed_function().function_type_arguments()->BitIndexIn(
+        num_non_copied_params_);
+  }
+
   // Flow graph orders.
   const GrowableArray<BlockEntryInstr*>& preorder() const { return preorder_; }
   const GrowableArray<BlockEntryInstr*>& postorder() const {
     return postorder_;
   }
   const GrowableArray<BlockEntryInstr*>& reverse_postorder() const {
     return reverse_postorder_;
   }
   static bool ShouldReorderBlocks(const Function& function, bool is_optimized);
   GrowableArray<BlockEntryInstr*>* CodegenBlockOrder(bool is_optimized);
@@ skipping 72 matching lines @@
                    Instruction* instr,
                    Environment* env,
                    UseKind use_kind);
   Instruction* AppendTo(Instruction* prev,
                         Instruction* instr,
                         Environment* env,
                         UseKind use_kind);
 
   // Operations on the flow graph.
   void ComputeSSA(intptr_t next_virtual_register_number,
-                  ZoneGrowableArray<Definition*>* inlining_parameters);
+                  ZoneGrowableArray<Definition*>* inlining_parameters,
+                  Definition* inlining_type_args);
 
   // Verification methods for debugging.
   bool VerifyUseLists();
   bool VerifyRedefinitions();
 
   void DiscoverBlocks();
 
   void MergeBlocks();
 
   // Compute information about effects occurring in different blocks and
@@ skipping 113 matching lines @@
   // SSA transformation methods and fields.
   void ComputeDominators(GrowableArray<BitVector*>* dominance_frontier);
 
   void CompressPath(intptr_t start_index,
                     intptr_t current_index,
                     GrowableArray<intptr_t>* parent,
                     GrowableArray<intptr_t>* label);
 
   void Rename(GrowableArray<PhiInstr*>* live_phis,
               VariableLivenessAnalysis* variable_liveness,
-              ZoneGrowableArray<Definition*>* inlining_parameters);
+              ZoneGrowableArray<Definition*>* inlining_parameters,
+              Definition* inlining_type_args);
   void RenameRecursive(BlockEntryInstr* block_entry,
                        GrowableArray<Definition*>* env,
                        GrowableArray<PhiInstr*>* live_phis,
                        VariableLivenessAnalysis* variable_liveness);
 
   void AttachEnvironment(Instruction* instr, GrowableArray<Definition*>* env);
 
   void InsertPhis(const GrowableArray<BlockEntryInstr*>& preorder,
                   const GrowableArray<BitVector*>& assigned_vars,
                   const GrowableArray<BitVector*>& dom_frontier,
@@ skipping 213 matching lines @@
 
  private:
   GrowableArray<Definition*> defs_;
   BitVector* contains_vector_;
 };
 
 
 }  // namespace dart
 
 #endif  // RUNTIME_VM_FLOW_GRAPH_H_