VM: Explicitly load function and context before calling a closure.

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 2832 matching lines @@
   virtual EffectSet Dependencies() const { return EffectSet::None(); }
   virtual bool AttributesEqual(Instruction* other) const { return true; }
 
   virtual bool MayThrow() const { return false; }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CurrentContextInstr);
 };
 
 
-class ClosureCallInstr : public TemplateDefinition<0> {
+class ClosureCallInstr : public TemplateDefinition<1> {
  public:
-  ClosureCallInstr(ClosureCallNode* node,
+  ClosureCallInstr(Value* function,
+                   ClosureCallNode* node,
                    ZoneGrowableArray<PushArgumentInstr*>* arguments)
       : ast_node_(*node),
-        arguments_(arguments) { }
+        arguments_(arguments) {
+    SetInputAt(0, function);
+  }
 
   DECLARE_INSTRUCTION(ClosureCall)
 
   const Array& argument_names() const { return ast_node_.arguments()->names(); }
   intptr_t token_pos() const { return ast_node_.token_pos(); }
 
   virtual intptr_t ArgumentCount() const { return arguments_->length(); }
   virtual PushArgumentInstr* PushArgumentAt(intptr_t index) const {
     return (*arguments_)[index];
   }
@@ skipping 4924 matching lines @@
   const Code& code() const { return code_; }
 
   Environment* DeepCopy() const { return DeepCopy(Length()); }
 
   void DeepCopyTo(Instruction* instr) const;
   void DeepCopyToOuter(Instruction* instr) const;
 
   void PrintTo(BufferFormatter* f) const;
   const char* ToCString() const;
 
+  // Deep copy an environment.  The 'length' parameter may be less than the
+  // environment's length in order to drop values (e.g., passed arguments)
+  // from the copy.
+  Environment* DeepCopy(intptr_t length) const;
+
  private:
   friend class ShallowIterator;
 
   Environment(intptr_t length,
               intptr_t fixed_parameter_count,
               intptr_t deopt_id,
               const Code& code,
               Environment* outer)
       : values_(length),
         locations_(NULL),
         fixed_parameter_count_(fixed_parameter_count),
         deopt_id_(deopt_id),
         code_(code),
         outer_(outer) { }
 
-  // Deep copy an environment.  The 'length' parameter may be less than the
-  // environment's length in order to drop values (e.g., passed arguments)
-  // from the copy.
-  Environment* DeepCopy(intptr_t length) const;
 
   GrowableArray<Value*> values_;
   Location* locations_;
   const intptr_t fixed_parameter_count_;
   intptr_t deopt_id_;
   const Code& code_;
   Environment* outer_;
 
   DISALLOW_COPY_AND_ASSIGN(Environment);
 };
@@ skipping 29 matching lines @@
   ForwardInstructionIterator* current_iterator_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FlowGraphVisitor);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_INTERMEDIATE_LANGUAGE_H_