Allocate instance closures similarly to regular closures, i.e. without a

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 VM_INTERMEDIATE_LANGUAGE_H_
 #define VM_INTERMEDIATE_LANGUAGE_H_
 
 #include "vm/allocation.h"
 #include "vm/ast.h"
 #include "vm/growable_array.h"
@@ skipping 627 matching lines @@
   M(NativeCall)                                                                \
   M(DebugStepCheck)                                                            \
   M(LoadIndexed)                                                               \
   M(StoreIndexed)                                                              \
   M(StoreInstanceField)                                                        \
   M(LoadStaticField)                                                           \
   M(StoreStaticField)                                                          \
   M(BooleanNegate)                                                             \
   M(InstanceOf)                                                                \
   M(CreateArray)                                                               \
-  M(CreateClosure)                                                             \
   M(AllocateObject)                                                            \
   M(LoadField)                                                                 \
   M(LoadUntagged)                                                              \
   M(LoadClassId)                                                               \
   M(InstantiateType)                                                           \
   M(InstantiateTypeArguments)                                                  \
   M(AllocateContext)                                                           \
   M(CloneContext)                                                              \
   M(BinarySmiOp)                                                               \
   M(UnarySmiOp)                                                                \
@@ skipping 2682 matching lines @@
   }
 
   DECLARE_INSTRUCTION(DropTemps)
 
   Value* value() const { return inputs_[0]; }
 
   intptr_t num_temps() const { return num_temps_; }
 
   virtual CompileType* ComputeInitialType() const;
 
+  virtual void PrintOperandsTo(BufferFormatter* f) const;
+
   virtual bool CanDeoptimize() const { return false; }
 
   virtual EffectSet Effects() const {
     UNREACHABLE();  // Eliminated by SSA construction.
     return EffectSet::None();
   }
 
   virtual bool MayThrow() const {
     UNREACHABLE();
     return false;
@@ skipping 774 matching lines @@
 
   virtual bool MayThrow() const { return false; }
 
  private:
   const intptr_t token_pos_;
 
   DISALLOW_COPY_AND_ASSIGN(CreateArrayInstr);
 };
 
 
-class CreateClosureInstr : public TemplateDefinition<0> {
- public:
-  CreateClosureInstr(const Function& function,
-                     ZoneGrowableArray<PushArgumentInstr*>* arguments,
-                     intptr_t token_pos)
-      : function_(function),
-        arguments_(arguments),
-        token_pos_(token_pos) { }
-
-  DECLARE_INSTRUCTION(CreateClosure)
-  virtual CompileType ComputeType() const;
-
-  intptr_t token_pos() const { return token_pos_; }
-  const Function& function() const { return function_; }
-
-  virtual intptr_t ArgumentCount() const { return arguments_->length(); }
-  virtual PushArgumentInstr* PushArgumentAt(intptr_t index) const {
-    return (*arguments_)[index];
-  }
-
-  virtual void PrintOperandsTo(BufferFormatter* f) const;
-
-  virtual bool CanDeoptimize() const { return false; }
-
-  virtual EffectSet Effects() const { return EffectSet::None(); }
-
-  virtual bool MayThrow() const { return false; }
-
- private:
-  const Function& function_;
-  ZoneGrowableArray<PushArgumentInstr*>* arguments_;
-  intptr_t token_pos_;
-
-  DISALLOW_COPY_AND_ASSIGN(CreateClosureInstr);
-};
-
-
 class LoadUntaggedInstr : public TemplateDefinition<1> {
  public:
   LoadUntaggedInstr(Value* object, intptr_t offset) : offset_(offset) {
     SetInputAt(0, object);
   }
 
   virtual Representation representation() const {
     return kUntagged;
   }
   DECLARE_INSTRUCTION(LoadUntagged)
@@ skipping 3006 matching lines @@
   ForwardInstructionIterator* current_iterator_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FlowGraphVisitor);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_INTERMEDIATE_LANGUAGE_H_