Remove the dependency of Zone on Isolate

test/cctest/compiler/test-simplified-lowering.cc

 // 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.
 
 #include <limits>
 
 #include "src/compiler/access-builder.h"
 #include "src/compiler/change-lowering.h"
 #include "src/compiler/control-builders.h"
 #include "src/compiler/graph-reducer.h"
@@ skipping 18 matching lines @@
 
 template <typename ReturnType>
 class SimplifiedLoweringTester : public GraphBuilderTester<ReturnType> {
  public:
   SimplifiedLoweringTester(MachineType p0 = kMachNone,
                            MachineType p1 = kMachNone,
                            MachineType p2 = kMachNone,
                            MachineType p3 = kMachNone,
                            MachineType p4 = kMachNone)
       : GraphBuilderTester<ReturnType>(p0, p1, p2, p3, p4),
-        typer(this->graph(), MaybeHandle<Context>()),
+        typer(this->isolate(), this->graph(), MaybeHandle<Context>()),
         javascript(this->zone()),
-        jsgraph(this->graph(), this->common(), &javascript, this->machine()),
+        jsgraph(this->isolate(), this->graph(), this->common(), &javascript,
+                this->machine()),
         lowering(&jsgraph, this->zone()) {}
 
   Typer typer;
   JSOperatorBuilder javascript;
   JSGraph jsgraph;
   SimplifiedLowering lowering;
 
   void LowerAllNodes() {
     this->End();
     typer.Run();
     lowering.LowerAllNodes();
   }
 
   void LowerAllNodesAndLowerChanges() {
     this->End();
     typer.Run();
     lowering.LowerAllNodes();
 
     Zone* zone = this->zone();
-    CompilationInfo info(zone->isolate(), zone);
-    Linkage linkage(
-        zone, Linkage::GetSimplifiedCDescriptor(zone, this->machine_sig_));
+    CompilationInfo info(this->isolate(), zone);
+    Linkage linkage(this->isolate(), zone, Linkage::GetSimplifiedCDescriptor(
+                                               zone, this->machine_sig_));
     ChangeLowering lowering(&jsgraph, &linkage);
     GraphReducer reducer(this->graph(), this->zone());
     reducer.AddReducer(&lowering);
     reducer.ReduceGraph();
     Verifier::Run(this->graph());
   }
 
   void CheckNumberCall(double expected, double input) {
     // TODO(titzer): make calls to NewNumber work in cctests.
     if (expected <= Smi::kMinValue) return;
@@ skipping 585 matching lines @@
   Node* p0;
   Node* p1;
   Node* p2;
   Node* start;
   Node* end;
   Node* ret;
 
   explicit TestingGraph(Type* p0_type, Type* p1_type = Type::None(),
                         Type* p2_type = Type::None())
       : GraphAndBuilders(main_zone()),
-        typer(graph(), MaybeHandle<Context>()),
+        typer(main_isolate(), graph(), MaybeHandle<Context>()),
         javascript(main_zone()),
-        jsgraph(graph(), common(), &javascript, machine()) {
+        jsgraph(main_isolate(), graph(), common(), &javascript, machine()) {
     start = graph()->NewNode(common()->Start(2));
     graph()->SetStart(start);
     ret =
         graph()->NewNode(common()->Return(), jsgraph.Constant(0), start, start);
     end = graph()->NewNode(common()->End(), ret);
     graph()->SetEnd(end);
     p0 = graph()->NewNode(common()->Parameter(0), start);
     p1 = graph()->NewNode(common()->Parameter(1), start);
     p2 = graph()->NewNode(common()->Parameter(2), start);
     typer.Run();
@@ skipping 282 matching lines @@
     t.CheckLoweringBinop(IrOpcode::kFloat64LessThan,
                          t.simplified()->NumberLessThan());
     t.CheckLoweringBinop(IrOpcode::kFloat64LessThanOrEqual,
                          t.simplified()->NumberLessThanOrEqual());
   }
 }
 
 
 TEST(LowerNumberAddSub_to_int32) {
   HandleAndZoneScope scope;
-  Factory* f = scope.main_zone()->isolate()->factory();
+  Factory* f = scope.main_isolate()->factory();
   Type* small_range =
       Type::Range(f->NewNumber(1), f->NewNumber(10), scope.main_zone());
   Type* large_range =
       Type::Range(f->NewNumber(-1e+13), f->NewNumber(1e+14), scope.main_zone());
   static Type* types[] = {Type::Signed32(), Type::Integral32(), small_range,
                           large_range};
 
   for (size_t i = 0; i < arraysize(types); i++) {
     for (size_t j = 0; j < arraysize(types); j++) {
       TestingGraph t(types[i], types[j]);
       t.CheckLoweringTruncatedBinop(IrOpcode::kInt32Add,
                                     t.simplified()->NumberAdd(),
                                     t.simplified()->NumberToInt32());
       t.CheckLoweringTruncatedBinop(IrOpcode::kInt32Sub,
                                     t.simplified()->NumberSubtract(),
                                     t.simplified()->NumberToInt32());
     }
   }
 }
 
 
 TEST(LowerNumberAddSub_to_uint32) {
   HandleAndZoneScope scope;
-  Factory* f = scope.main_zone()->isolate()->factory();
+  Factory* f = scope.main_isolate()->factory();
   Type* small_range =
       Type::Range(f->NewNumber(1), f->NewNumber(10), scope.main_zone());
   Type* large_range =
       Type::Range(f->NewNumber(-1e+13), f->NewNumber(1e+14), scope.main_zone());
   static Type* types[] = {Type::Signed32(), Type::Integral32(), small_range,
                           large_range};
 
   for (size_t i = 0; i < arraysize(types); i++) {
     for (size_t j = 0; j < arraysize(types); j++) {
       TestingGraph t(types[i], types[j]);
@@ skipping 1034 matching lines @@
     Bounds phi_bounds = Bounds::Either(Bounds(d.arg1), Bounds(d.arg2), z);
     NodeProperties::SetBounds(phi, phi_bounds);
 
     Node* use = t.Use(phi, d.use);
     t.Return(use);
     t.Lower();
 
     CHECK_EQ(d.expected, OpParameter<MachineType>(phi));
   }
 }