[turbofan] Rename context stack as part of the environment for OSR.

src/compiler/ast-graph-builder.h

 // Copyright 2014 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef V8_COMPILER_AST_GRAPH_BUILDER_H_
 #define V8_COMPILER_AST_GRAPH_BUILDER_H_
 
 #include "src/ast.h"
 #include "src/compiler/js-graph.h"
 
@@ skipping 59 matching lines @@
   class ControlScopeForFinally;
   class Environment;
   friend class ControlBuilder;
 
   Zone* local_zone_;
   CompilationInfo* info_;
   JSGraph* jsgraph_;
   Environment* environment_;
   AstContext* ast_context_;
 
+  bool CreateGraphBody();

[Michael Starzinger, 2015/02/17 10:34:37]

nit: Please move this down to below all the fields (e.g. to line 135) for
readability.

+
   // List of global declarations for functions and variables.
   ZoneVector<Handle<Object>> globals_;
 
   // Stack of control scopes currently entered by the visitor.
   ControlScope* execution_control_;
 
   // Stack of context objects pushed onto the chain by the visitor.
   ContextScope* execution_context_;
 
   // Nodes representing values in the activation record.
   SetOncePointer<Node> function_closure_;
-  SetOncePointer<Node> function_context_;
+  Node* function_context_;
 
   // Temporary storage for building node input lists.
   int input_buffer_size_;
   Node** input_buffer_;
 
   // Node representing the control dependency for dead code.
   SetOncePointer<Node> dead_control_;
 
   // Merge of all control nodes that exit the function body.
   Node* exit_control_;
 
   // Result of loop assignment analysis performed before graph creation.
   LoopAssignmentAnalysis* loop_assignment_analysis_;
 
   // Growth increment for the temporary buffer used to construct input lists to
   // new nodes.
   static const int kInputBufferSizeIncrement = 64;
 
   Zone* local_zone() const { return local_zone_; }
-  Environment* environment() { return environment_; }
+  Environment* environment() const { return environment_; }
   AstContext* ast_context() const { return ast_context_; }
   ControlScope* execution_control() const { return execution_control_; }
   ContextScope* execution_context() const { return execution_context_; }
   CommonOperatorBuilder* common() const { return jsgraph_->common(); }
   CompilationInfo* info() const { return info_; }
   LanguageMode language_mode() const;
   JSGraph* jsgraph() { return jsgraph_; }
   Graph* graph() { return jsgraph_->graph(); }
   Zone* graph_zone() { return graph()->zone(); }
   JSOperatorBuilder* javascript() { return jsgraph_->javascript(); }
@@ skipping 47 matching lines @@
 
   Node* NewNode(const Operator* op, int value_input_count, Node** value_inputs,
                 bool incomplete = false) {
     return MakeNode(op, value_input_count, value_inputs, incomplete);
   }
 
   // Creates a new Phi node having {count} input values.
   Node* NewPhi(int count, Node* input, Node* control);
   Node* NewEffectPhi(int count, Node* input, Node* control);
 
+  Node* NewOuterContextParam();
+  Node* NewCurrentContextOsrValue();
+
   // Helpers for merging control, effect or value dependencies.
   Node* MergeControl(Node* control, Node* other);
   Node* MergeEffect(Node* value, Node* other, Node* control);
   Node* MergeValue(Node* value, Node* other, Node* control);
 
   // The main node creation chokepoint. Adds context, frame state, effect,
   // and control dependencies depending on the operator.
   Node* MakeNode(const Operator* op, int value_input_count, Node** value_inputs,
                  bool incomplete);
 
@@ skipping 166 matching lines @@
   Node* Lookup(Variable* variable) {
     DCHECK(variable->IsStackAllocated());
     if (variable->IsParameter()) {
       return values()->at(variable->index() + 1);
     } else {
       DCHECK(variable->IsStackLocal());
       return values()->at(variable->index() + parameters_count_);
     }
   }
 
+  Node* Context() const { return contexts_[contexts_.size() - 1]; }

[Michael Starzinger, 2015/02/17 10:34:37]

Can use contexts()->back() here instead.

[titzer, 2015/02/17 10:44:17]

Done.

+  void PushContext(Node* context) { contexts()->push_back(context); }
+  void PopContext() { contexts()->pop_back(); }
+
   // Operations on the operand stack.
   void Push(Node* node) {
     values()->push_back(node);
   }
   Node* Top() {
     DCHECK(stack_height() > 0);
     return values()->back();
   }
   Node* Pop() {
     DCHECK(stack_height() > 0);
@@ skipping 54 matching lines @@
     env->MarkAsUnreachable();
     return env;
   }
 
   // Copies this environment at a loop header control-flow point.
   Environment* CopyForLoop(BitVector* assigned, bool is_osr = false) {
     PrepareForLoop(assigned, is_osr);
     return Copy();
   }
 
+  int ContextStackDepth() { return static_cast<int>(contexts_.size()); }
+
  private:
   AstGraphBuilder* builder_;
   int parameters_count_;
   int locals_count_;
   NodeVector values_;
+  NodeVector contexts_;
   Node* control_dependency_;
   Node* effect_dependency_;
   Node* parameters_node_;
   Node* locals_node_;
   Node* stack_node_;
 
   explicit Environment(const Environment* copy);
   Environment* Copy() { return new (zone()) Environment(this); }
   void UpdateStateValues(Node** state_values, int offset, int count);
   Zone* zone() const { return builder_->local_zone(); }
   Graph* graph() const { return builder_->graph(); }
   AstGraphBuilder* builder() const { return builder_; }
   CommonOperatorBuilder* common() { return builder_->common(); }
   NodeVector* values() { return &values_; }
+  NodeVector* contexts() { return &contexts_; }
 
   // Prepare environment to be used as loop header.
   void PrepareForLoop(BitVector* assigned, bool is_osr = false);
 };
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_COMPILER_AST_GRAPH_BUILDER_H_