Remove the dependency of Zone on Isolate

src/compiler/graph-builder.h

 // Copyright 2013 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_GRAPH_BUILDER_H_
 #define V8_COMPILER_GRAPH_BUILDER_H_
 
 #include "src/v8.h"
 
 #include "src/allocation.h"
 #include "src/compiler/common-operator.h"
 #include "src/compiler/graph.h"
 #include "src/compiler/node.h"
 #include "src/unique.h"
 
 namespace v8 {
 namespace internal {
 
 class BitVector;
 
 namespace compiler {
 
 class Node;
 
 // A common base class for anything that creates nodes in a graph.
 class GraphBuilder {
  public:
-  explicit GraphBuilder(Graph* graph) : graph_(graph) {}
+  GraphBuilder(Isolate* isolate, Graph* graph)
+      : isolate_(isolate), graph_(graph) {}
   virtual ~GraphBuilder() {}
 
   Node* NewNode(const Operator* op, bool incomplete = false) {
     return MakeNode(op, 0, static_cast<Node**>(NULL), incomplete);
   }
 
   Node* NewNode(const Operator* op, Node* n1) {
     return MakeNode(op, 1, &n1, false);
   }
 
@@ skipping 22 matching lines @@
                 Node* n5, Node* n6) {
     Node* nodes[] = {n1, n2, n3, n4, n5, n6};
     return MakeNode(op, arraysize(nodes), nodes, false);
   }
 
   Node* NewNode(const Operator* op, int value_input_count, Node** value_inputs,
                 bool incomplete = false) {
     return MakeNode(op, value_input_count, value_inputs, incomplete);
   }
 
+  Isolate* isolate() const { return isolate_; }
   Graph* graph() const { return graph_; }
 
  protected:
   // Base implementation used by all factory methods.
   virtual Node* MakeNode(const Operator* op, int value_input_count,
                          Node** value_inputs, bool incomplete) = 0;
 
  private:
+  Isolate* isolate_;
   Graph* graph_;
 };
 
 
 // The StructuredGraphBuilder produces a high-level IR graph. It is used as the
 // base class for concrete implementations (e.g the AstGraphBuilder or the
 // StubGraphBuilder).
 class StructuredGraphBuilder : public GraphBuilder {
  public:
-  StructuredGraphBuilder(Zone* zone, Graph* graph,
+  StructuredGraphBuilder(Isolate* isolate, Zone* zone, Graph* graph,
                          CommonOperatorBuilder* common);
   ~StructuredGraphBuilder() OVERRIDE {}
 
   // 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);
 
   // Helpers for merging control, effect or value dependencies.
   Node* MergeControl(Node* control, Node* other);
   Node* MergeEffect(Node* value, Node* other, Node* control);
@@ skipping 25 matching lines @@
   Node* current_context() const { return current_context_; }
   void set_current_context(Node* context) { current_context_ = context; }
 
   Node* exit_control() const { return exit_control_; }
   void set_exit_control(Node* node) { exit_control_ = node; }
 
   Node* dead_control();
 
   Zone* graph_zone() const { return graph()->zone(); }
   Zone* local_zone() const { return local_zone_; }
-  Isolate* isolate() const { return graph_zone()->isolate(); }
+  Isolate* isolate() const { return isolate_; }

[Michael Starzinger, 2015/01/23 14:21:10]

Can be dropped since it now just overrides GraphBuilder::isolate anyways.

[danno, 2015/01/23 14:45:20]

Done.

   CommonOperatorBuilder* common() const { return common_; }
 
   // Helper to wrap a Handle<T> into a Unique<T>.
   template <class T>
   Unique<T> MakeUnique(Handle<T> object) {
     return Unique<T>::CreateUninitialized(object);
   }
 
   // Support for control flow builders. The concrete type of the environment
   // depends on the graph builder, but environments themselves are not virtual.
   virtual Environment* CopyEnvironment(Environment* env);
 
   // Helper to indicate a node exits the function body.
   void UpdateControlDependencyToLeaveFunction(Node* exit);
 
  private:
   CommonOperatorBuilder* common_;
   Environment* environment_;
 
+  Isolate* isolate_;

[Michael Starzinger, 2015/01/23 14:21:10]

Can be dropped now since it shadows GraphBuilder::isolate_ now.

[danno, 2015/01/23 14:45:20]

Done.

+
   // Zone local to the builder for data not leaking into the graph.
   Zone* local_zone_;
 
   // 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_;
 
@@ skipping 76 matching lines @@
   StructuredGraphBuilder* builder_;
   Node* control_dependency_;
   Node* effect_dependency_;
   NodeVector values_;
 };
 }
 }
 }  // namespace v8::internal::compiler
 
 #endif  // V8_COMPILER_GRAPH_BUILDER_H__