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

runtime/vm/intermediate_language.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_INTERMEDIATE_LANGUAGE_H_
 #define RUNTIME_VM_INTERMEDIATE_LANGUAGE_H_
 
 #include "vm/allocation.h"
 #include "vm/ast.h"
 #include "vm/growable_array.h"
@@ skipping 99 matching lines @@
 
   static CompileType CreateNullable(bool is_nullable, intptr_t cid) {
     return CompileType(is_nullable, cid, NULL);
   }
 
   // Create a new CompileType representing given abstract type. By default
   // values as assumed to be nullable.
   static CompileType FromAbstractType(const AbstractType& type,
                                       bool is_nullable = kNullable);
 
-  // Create a new CompileType representing an value with the given class id.
+  // Create a new CompileType representing a value with the given class id.
   // Resulting CompileType is nullable only if cid is kDynamicCid or kNullCid.
   static CompileType FromCid(intptr_t cid);
 
   // Create None CompileType. It is the bottom of the lattice and is used to
   // represent type of the phi that was not yet inferred.
   static CompileType None() {
     return CompileType(kNullable, kIllegalCid, NULL);
   }
 
   // Create Dynamic CompileType. It is the top of the lattice and is used to
@@ skipping 243 matching lines @@
   M(PushArgument)                                                              \
   M(Return)                                                                    \
   M(Throw)                                                                     \
   M(ReThrow)                                                                   \
   M(Stop)                                                                      \
   M(Goto)                                                                      \
   M(IndirectGoto)                                                              \
   M(Branch)                                                                    \
   M(AssertAssignable)                                                          \
   M(AssertBoolean)                                                             \
-  M(CurrentContext)                                                            \
+  M(SpecialParameter)                                                          \
   M(ClosureCall)                                                               \
   M(InstanceCall)                                                              \
   M(PolymorphicInstanceCall)                                                   \
   M(StaticCall)                                                                \
   M(LoadLocal)                                                                 \
   M(DropTemps)                                                                 \
   M(StoreLocal)                                                                \
   M(StrictCompare)                                                             \
   M(EqualityCompare)                                                           \
   M(RelationalOp)                                                              \
@@ skipping 2376 matching lines @@
 
   PRINT_OPERANDS_TO_SUPPORT
 
  private:
   const TokenPosition token_pos_;
 
   DISALLOW_COPY_AND_ASSIGN(AssertBooleanInstr);
 };
 
 
-// Denotes the current context, normally held in a register.  This is
-// a computation, not a value, because it's mutable.
-class CurrentContextInstr : public TemplateDefinition<0, NoThrow> {
+// Denotes a special parameter, currently either the context of a closure
+// or the type arguments of a generic function.
+class SpecialParameterInstr : public TemplateDefinition<0, NoThrow> {
  public:
-  explicit CurrentContextInstr(intptr_t deopt_id)
-      : TemplateDefinition(deopt_id) {}
+  enum SpecialParameterKind { kContext, kTypeArgs };
+  SpecialParameterInstr(SpecialParameterKind kind, intptr_t deopt_id)
+      : TemplateDefinition(deopt_id), kind_(kind) {}
 
-  DECLARE_INSTRUCTION(CurrentContext)
+  DECLARE_INSTRUCTION(SpecialParameter)
   virtual CompileType ComputeType() const;
 
   virtual bool ComputeCanDeoptimize() const { return false; }
 
   virtual EffectSet Effects() const { return EffectSet::None(); }
   virtual EffectSet Dependencies() const { return EffectSet::None(); }
-  virtual bool AttributesEqual(Instruction* other) const { return true; }
+  virtual bool AttributesEqual(Instruction* other) const {
+    return kind() == other->AsSpecialParameter()->kind();
+  }
+  SpecialParameterKind kind() const { return kind_; }
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(CurrentContextInstr);
+  const SpecialParameterKind kind_;
+  DISALLOW_COPY_AND_ASSIGN(SpecialParameterInstr);
 };
 
 
 struct ArgumentsInfo {
   ArgumentsInfo(intptr_t type_args_len,
                 intptr_t pushed_argc,
                 const Array& argument_names)
       : type_args_len(type_args_len),
         pushed_argc(pushed_argc),
         argument_names(argument_names) {}
@@ skipping 5447 matching lines @@
   LocationSummary* Name::MakeLocationSummary(Zone* zone, bool opt) const {     \
     UNIMPLEMENTED();                                                           \
     return NULL;                                                               \
   }                                                                            \
   void Name::EmitNativeCode(FlowGraphCompiler* compiler) { UNIMPLEMENTED(); }
 
 
 }  // namespace dart
 
 #endif  // RUNTIME_VM_INTERMEDIATE_LANGUAGE_H_