Add contexts.

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"
@@ skipping 11 matching lines @@
   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(StoreContext, StoreContextComp)                                            \
   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(StaticSetter, StaticSetterComp)                                            \
   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)                                        \
   M(NativeLoadField, NativeLoadFieldComp)                                      \
   M(ExtractFactoryTypeArguments, ExtractFactoryTypeArgumentsComp)              \
   M(ExtractConstructorTypeArguments, ExtractConstructorTypeArgumentsComp)      \
   M(ExtractConstructorInstantiator, ExtractConstructorInstantiatorComp)        \
+  M(AllocateContext, AllocateContextComp)                                      \
+  M(ChainContext, ChainContextComp)                                            \
 
 
 #define FORWARD_DECLARATION(ShortName, ClassName) class ClassName;
 FOR_EACH_COMPUTATION(FORWARD_DECLARATION)
 #undef FORWARD_DECLARATION
 
 class Computation : public ZoneAllocated {
  public:
   Computation() { }
 
@@ skipping 89 matching lines @@
  public:
   CurrentContextComp() { }
 
   DECLARE_COMPUTATION(CurrentContext)
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CurrentContextComp);
 };
 
 
+class StoreContextComp : public Computation {
+ public:
+  explicit StoreContextComp(Value* value) : value_(value) {
+    ASSERT(value_ != NULL);
+  }
+
+  DECLARE_COMPUTATION(StoreContext);
+
+  Value* value() const { return value_; }
+
+ private:
+  Value* value_;
+
+  DISALLOW_COPY_AND_ASSIGN(StoreContextComp);
+};
+
+
 class ClosureCallComp : public Computation {
  public:
   ClosureCallComp(ClosureCallNode* node,
                   Value* context,
                   ZoneGrowableArray<Value*>* arguments)
       : ast_node_(*node),
         context_(context),
         arguments_(arguments) {
     ASSERT(context->IsTemp());
   }
@@ skipping 108 matching lines @@
   const Function& function_;
   const Array& argument_names_;
   ZoneGrowableArray<Value*>* arguments_;
 
   DISALLOW_COPY_AND_ASSIGN(StaticCallComp);
 };
 
 
 class LoadLocalComp : public Computation {
  public:
-  explicit LoadLocalComp(const LocalVariable& local) : local_(local) { }
+  LoadLocalComp(const LocalVariable& local, intptr_t context_level)
+      : local_(local), context_level_(context_level) { }
 
   DECLARE_COMPUTATION(LoadLocal)
 
   const LocalVariable& local() const { return local_; }
+  intptr_t context_level() const { return context_level_; }
 
  private:
   const LocalVariable& local_;
+  const intptr_t context_level_;
 
   DISALLOW_COPY_AND_ASSIGN(LoadLocalComp);
 };
 
 
 class StoreLocalComp : public Computation {
  public:
-  StoreLocalComp(const LocalVariable& local, Value* value)
-      : local_(local), value_(value) { }
+  StoreLocalComp(const LocalVariable& local,
+                 Value* value,
+                 intptr_t context_level)
+      : local_(local), value_(value), context_level_(context_level) { }
 
   DECLARE_COMPUTATION(StoreLocal)
 
   const LocalVariable& local() const { return local_; }
   Value* value() const { return value_; }
+  intptr_t context_level() const { return context_level_; }
 
  private:
   const LocalVariable& local_;
   Value* value_;
+  const intptr_t context_level_;
 
   DISALLOW_COPY_AND_ASSIGN(StoreLocalComp);
 };
 
 
 class NativeCallComp : public Computation {
  public:
   explicit NativeCallComp(NativeBodyNode* node) : ast_node_(*node) {}
 
   DECLARE_COMPUTATION(NativeCall)
@@ skipping 405 matching lines @@
 
  private:
   const ConstructorCallNode& ast_node_;
   Value* instantiator_;
   Value* discard_value_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtractConstructorInstantiatorComp);
 };
 
 
+class AllocateContextComp : public Computation {
+ public:
+  AllocateContextComp(intptr_t token_index, intptr_t num_context_variables)
+      : token_index_(token_index),
+        num_context_variables_(num_context_variables) {}
+
+  DECLARE_COMPUTATION(AllocateContext);
+
+  intptr_t token_index() const { return token_index_; }
+  intptr_t num_context_variables() const { return num_context_variables_; }
+
+ private:
+  const intptr_t token_index_;
+  const intptr_t num_context_variables_;
+
+  DISALLOW_COPY_AND_ASSIGN(AllocateContextComp);
+};
+
+
+class ChainContextComp : public Computation {
+ public:
+  explicit ChainContextComp(Value* context_value)
+      : context_value_(context_value) {
+    ASSERT(context_value_ != NULL);
+  }
+
+  DECLARE_COMPUTATION(ChainContext)
+
+  Value* context_value() const { return context_value_; }
+
+ private:
+  Value* context_value_;
+
+  DISALLOW_COPY_AND_ASSIGN(ChainContextComp);
+};
+
+
 #undef DECLARE_COMPUTATION
 
 
 // Instructions.
 //
 // <Instruction> ::= JoinEntry <Instruction>
 //                 | TargetEntry <Instruction>
 //                 | PickTemp <int> <int> <Instruction>
 //                 | TuckTemp <int> <int> <Instruction>
 //                 | Do <Computation> <Instruction>
@@ skipping 467 matching lines @@
   const GrowableArray<BlockEntryInstr*>& block_order_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FlowGraphVisitor);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_INTERMEDIATE_LANGUAGE_H_