Support allocating and calling closures in the new non-optimizing compiler.

runtime/vm/intermediate_language.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_INTERMEDIATE_LANGUAGE_H_
 #define VM_INTERMEDIATE_LANGUAGE_H_
 
 #include "vm/allocation.h"
 #include "vm/ast.h"
 #include "vm/growable_array.h"
 #include "vm/handles_impl.h"
 #include "vm/object.h"
 
 namespace dart {
 
 class FlowGraphVisitor;
 class LocalVariable;
 
 // Computations and values.
 //
 // <Computation> ::=
 //   <Value>
 // | AssertAssignable <Value> <AbstractType>
-// | InstanceCall <AstNode> <String> <Value> ...
+// | CurrentContext
+// | ClosureCall <ClosureCallNode> <Value> <Value> ...
+// | InstanceCall <String> <Value> ...
 // | StaticCall <StaticCallNode> <Value> ...
 // | LoadLocal <LocalVariable>
 // | StoreLocal <LocalVariable> <Value>
 // | StrictCompare <Token::kind> <Value> <Value>
 // | NativeCall <NativeBodyNode>
 // | StoreIndexed <Value> <Value> <Value>
 // | InstanceSetter <String> <Value> <Value>
 // | LoadInstanceField <LoadInstanceFieldNode> <Value>
 // | StoreInstanceField <StoreInstanceFieldNode> <Value> <Value>
 // | LoadStaticField <Field>
 // | StoreStaticField <Field> <Value>
 // | BooleanNegate <Value>
 // | InstanceOf <Value> <Type>
+// | CreateArray <ArrayNode> <Value> ...
+// | CreateClosure <ClosureNode>
 // | AllocateObject <ConstructorCallNode>
 //
 // <Value> ::=
 //   Temp <int>
 // | Constant <Instance>
 
 // M is a two argument macro.  It is applied to each concrete value's
 // typename and classname.
 #define FOR_EACH_VALUE(M)                                                      \
   M(Temp, TempVal)                                                             \
   M(Constant, ConstantVal)                                                     \
 
 
 // M is a two argument macro.  It is applied to each concrete instruction's
 // (including the values) typename and classname.
 #define FOR_EACH_COMPUTATION(M)                                                \
   FOR_EACH_VALUE(M)                                                            \
   M(AssertAssignable, AssertAssignableComp)                                    \
+  M(CurrentContext, CurrentContextComp)                                        \
+  M(ClosureCall, ClosureCallComp)                                              \
   M(InstanceCall, InstanceCallComp)                                            \
   M(StaticCall, StaticCallComp)                                                \
   M(LoadLocal, LoadLocalComp)                                                  \
   M(StoreLocal, StoreLocalComp)                                                \
   M(StrictCompare, StrictCompareComp)                                          \
   M(NativeCall, NativeCallComp)                                                \
   M(StoreIndexed, StoreIndexedComp)                                            \
   M(InstanceSetter, InstanceSetterComp)                                        \
   M(LoadInstanceField, LoadInstanceFieldComp)                                  \
   M(StoreInstanceField, StoreInstanceFieldComp)                                \
   M(LoadStaticField, LoadStaticFieldComp)                                      \
   M(StoreStaticField, StoreStaticFieldComp)                                    \
   M(BooleanNegate, BooleanNegateComp)                                          \
   M(InstanceOf, InstanceOfComp)                                                \
   M(CreateArray, CreateArrayComp)                                              \
+  M(CreateClosure, CreateClosureComp)                                          \
   M(AllocateObject, AllocateObjectComp)                                        \
 
 
 #define FORWARD_DECLARATION(ShortName, ClassName) class ClassName;
 FOR_EACH_COMPUTATION(FORWARD_DECLARATION)
 #undef FORWARD_DECLARATION
 
 class Computation : public ZoneAllocated {
  public:
   Computation() { }
@@ skipping 77 matching lines @@
   const AbstractType& type() const { return type_; }
 
  private:
   Value* value_;
   const AbstractType& type_;
 
   DISALLOW_COPY_AND_ASSIGN(AssertAssignableComp);
 };
 
 
+// Denotes the current context, normally held in a register.  This is
+// a computation, not a value, because it's mutable.
+class CurrentContextComp : public Computation {
+ public:
+  CurrentContextComp() { }
+
+  DECLARE_COMPUTATION(CurrentContext)
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(CurrentContextComp);
+};
+
+
+class ClosureCallComp : public Computation {
+ public:
+  ClosureCallComp(ClosureCallNode* node,
+                  Value* context,
+                  ZoneGrowableArray<Value*>* arguments)
+      : ast_node_(*node),
+        context_(context),
+        arguments_(arguments) {
+    ASSERT(context->IsTemp());
+  }
+
+  DECLARE_COMPUTATION(ClosureCall)
+
+  const Array& argument_names() const { return ast_node_.arguments()->names(); }
+  intptr_t token_index() const { return ast_node_.token_index(); }
+
+  Value* context() const { return context_; }
+  intptr_t ArgumentCount() const { return arguments_->length(); }
+  Value* ArgumentAt(intptr_t index) const { return (*arguments_)[index]; }
+
+ private:
+  const ClosureCallNode& ast_node_;
+  Value* context_;
+  ZoneGrowableArray<Value*>* arguments_;
+
+  DISALLOW_COPY_AND_ASSIGN(ClosureCallComp);
+};
+
+
 class InstanceCallComp : public Computation {
  public:
   InstanceCallComp(intptr_t node_id,
                    intptr_t token_index,
                    const String& function_name,
                    ZoneGrowableArray<Value*>* arguments,
                    const Array& argument_names,
                    intptr_t checked_argument_count)
       : node_id_(node_id),
         token_index_(token_index),
         function_name_(function_name),
         arguments_(arguments),
         argument_names_(argument_names),
         checked_argument_count_(checked_argument_count) {
     ASSERT(function_name.IsZoneHandle());
     ASSERT(!arguments->is_empty());
     ASSERT(argument_names.IsZoneHandle());
   }
 
   DECLARE_COMPUTATION(InstanceCall)
 
   intptr_t node_id() const { return node_id_; }
   intptr_t token_index() const { return token_index_; }
   const String& function_name() const { return function_name_; }
-  int ArgumentCount() const { return arguments_->length(); }
-  Value* ArgumentAt(int index) const { return (*arguments_)[index]; }
+  intptr_t ArgumentCount() const { return arguments_->length(); }
+  Value* ArgumentAt(intptr_t index) const { return (*arguments_)[index]; }
   const Array& argument_names() const { return argument_names_; }
   intptr_t checked_argument_count() const { return checked_argument_count_; }
 
  private:
   const intptr_t node_id_;
   const intptr_t token_index_;
   const String& function_name_;
   ZoneGrowableArray<Value*>* const arguments_;
   const Array& argument_names_;
   const intptr_t checked_argument_count_;
@@ skipping 38 matching lines @@
     ASSERT(argument_names.IsZoneHandle());
   }
 
   DECLARE_COMPUTATION(StaticCall)
 
   // Accessors forwarded to the AST node.
   const Function& function() const { return function_; }
   const Array& argument_names() const { return argument_names_; }
   intptr_t token_index() const { return token_index_; }
 
-  int ArgumentCount() const { return arguments_->length(); }
-  Value* ArgumentAt(int index) const { return (*arguments_)[index]; }
+  intptr_t ArgumentCount() const { return arguments_->length(); }
+  Value* ArgumentAt(intptr_t index) const { return (*arguments_)[index]; }
 
  private:
   const intptr_t token_index_;
   const Function& function_;
   const Array& argument_names_;
   ZoneGrowableArray<Value*>* arguments_;
 
   DISALLOW_COPY_AND_ASSIGN(StaticCallComp);
 };
 
@@ skipping 297 matching lines @@
   Value* ElementAt(intptr_t i) const { return (*elements_)[i]; }
 
  private:
   const ArrayNode& ast_node_;
   ZoneGrowableArray<Value*>* const elements_;
 
   DISALLOW_COPY_AND_ASSIGN(CreateArrayComp);
 };
 
 
+class CreateClosureComp : public Computation {
+ public:
+  explicit CreateClosureComp(ClosureNode* node) : ast_node_(*node) { }
+
+  DECLARE_COMPUTATION(CreateClosure)
+
+  intptr_t token_index() const { return ast_node_.token_index(); }
+  const Function& function() const { return ast_node_.function(); }
+
+ private:
+  const ClosureNode& ast_node_;
+
+  DISALLOW_COPY_AND_ASSIGN(CreateClosureComp);
+};
+
+
 #undef DECLARE_COMPUTATION
 
 
 // Instructions.
 //
 // <Instruction> ::= JoinEntry <Instruction>
 //                 | TargetEntry <Instruction>
 //                 | PickTemp <int> <int> <Instruction>
 //                 | TuckTemp <int> <int> <Instruction>
 //                 | Do <Computation> <Instruction>
@@ skipping 329 matching lines @@
 #undef DECLARE_VISIT_INSTRUCTION
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FlowGraphVisitor);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_INTERMEDIATE_LANGUAGE_H_