Reland: [Parse] ParseInfo owns the parsing Zone.

test/cctest/compiler/test-run-bytecode-graph-builder.cc

 // Copyright 2015 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 <utility>
 
 #include "src/compilation-info.h"
 #include "src/compiler/pipeline.h"
 #include "src/execution.h"
 #include "src/handles.h"
@@ skipping 56 matching lines @@
   }
 
  private:
   Isolate* isolate_;
   Handle<JSFunction> function_;
 };
 
 
 class BytecodeGraphTester {
  public:
-  BytecodeGraphTester(Isolate* isolate, Zone* zone, const char* script,
+  BytecodeGraphTester(Isolate* isolate, const char* script,
                       const char* filter = kFunctionName)
-      : isolate_(isolate), zone_(zone), script_(script) {
+      : isolate_(isolate), script_(script) {
     i::FLAG_ignition = true;
     i::FLAG_always_opt = false;
     i::FLAG_allow_natives_syntax = true;
     i::FLAG_loop_assignment_analysis = false;
   }
   virtual ~BytecodeGraphTester() {}
 
   template <class... A>
   BytecodeGraphCallable<A...> GetCallable(
       const char* functionName = kFunctionName) {
@@ skipping 11 matching lines @@
     CHECK(!try_catch.Message().IsEmpty());
     return try_catch.Message();
   }
 
   static Handle<Object> NewObject(const char* script) {
     return v8::Utils::OpenHandle(*CompileRun(script));
   }
 
  private:
   Isolate* isolate_;
-  Zone* zone_;
   const char* script_;
 
   Handle<JSFunction> GetFunction(const char* functionName) {
     CompileRun(script_);
     Local<Function> api_function = Local<Function>::Cast(
         CcTest::global()
             ->Get(CcTest::isolate()->GetCurrentContext(), v8_str(functionName))
             .ToLocalChecked());
     Handle<JSFunction> function =
         Handle<JSFunction>::cast(v8::Utils::OpenHandle(*api_function));
     CHECK(function->shared()->HasBytecodeArray());
 
     // TODO(mstarzinger): We should be able to prime CompilationInfo without
     // having to instantiate a ParseInfo first. Fix this!
-    ParseInfo parse_info(zone_, handle(function->shared()));
+    ParseInfo parse_info(handle(function->shared()));
 
     CompilationInfo compilation_info(&parse_info, function);
     compilation_info.SetOptimizing();
     compilation_info.MarkAsDeoptimizationEnabled();
     compilation_info.MarkAsOptimizeFromBytecode();
     Handle<Code> code = Pipeline::GenerateCodeForTesting(&compilation_info);
     function->ReplaceCode(*code);
 
     return function;
   }
@@ skipping 43 matching lines @@
     CHECK_GE(i, 0);
     CHECK_LT(i, N);
     return return_value_and_parameters[1 + i];
   }
 };
 
 
 TEST(BytecodeGraphBuilderReturnStatements) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
 
   ExpectedSnippet<0> snippets[] = {
       {"return;", {factory->undefined_value()}},
       {"return null;", {factory->null_value()}},
       {"return true;", {factory->true_value()}},
       {"return false;", {factory->false_value()}},
       {"return 0;", {factory->NewNumberFromInt(0)}},
       {"return +1;", {factory->NewNumberFromInt(1)}},
       {"return -1;", {factory->NewNumberFromInt(-1)}},
       {"return +127;", {factory->NewNumberFromInt(127)}},
       {"return -128;", {factory->NewNumberFromInt(-128)}},
       {"return 0.001;", {factory->NewNumber(0.001)}},
       {"return 3.7e-60;", {factory->NewNumber(3.7e-60)}},
       {"return -3.7e60;", {factory->NewNumber(-3.7e60)}},
       {"return '';", {factory->NewStringFromStaticChars("")}},
       {"return 'catfood';", {factory->NewStringFromStaticChars("catfood")}},
       {"return NaN;", {factory->nan_value()}}};
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     ScopedVector<char> script(1024);
     SNPrintF(script, "function %s() { %s }\n%s();", kFunctionName,
              snippets[i].code_snippet, kFunctionName);
 
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     auto callable = tester.GetCallable<>();
     Handle<Object> return_value = callable().ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 
 TEST(BytecodeGraphBuilderPrimitiveExpressions) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
 
   ExpectedSnippet<0> snippets[] = {
       {"return 1 + 1;", {factory->NewNumberFromInt(2)}},
       {"return 20 - 30;", {factory->NewNumberFromInt(-10)}},
       {"return 4 * 100;", {factory->NewNumberFromInt(400)}},
       {"return 100 / 5;", {factory->NewNumberFromInt(20)}},
       {"return 25 % 7;", {factory->NewNumberFromInt(4)}},
   };
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     ScopedVector<char> script(1024);
     SNPrintF(script, "function %s() { %s }\n%s();", kFunctionName,
              snippets[i].code_snippet, kFunctionName);
 
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     auto callable = tester.GetCallable<>();
     Handle<Object> return_value = callable().ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 
 TEST(BytecodeGraphBuilderTwoParameterTests) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
 
   ExpectedSnippet<2> snippets[] = {
       // Integers
       {"return p1 + p2;",
        {factory->NewNumberFromInt(-70), factory->NewNumberFromInt(3),
         factory->NewNumberFromInt(-73)}},
       {"return p1 + p2 + 3;",
        {factory->NewNumberFromInt(1139044), factory->NewNumberFromInt(300),
         factory->NewNumberFromInt(1138741)}},
@@ skipping 26 matching lines @@
       {"return p1 + p2;",
        {factory->NewStringFromStaticChars("abcdef"),
         factory->NewStringFromStaticChars("abc"),
         factory->NewStringFromStaticChars("def")}}};
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     ScopedVector<char> script(1024);
     SNPrintF(script, "function %s(p1, p2) { %s }\n%s(0, 0);", kFunctionName,
              snippets[i].code_snippet, kFunctionName);
 
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     auto callable = tester.GetCallable<Handle<Object>, Handle<Object>>();
     Handle<Object> return_value =
         callable(snippets[i].parameter(0), snippets[i].parameter(1))
             .ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 
 TEST(BytecodeGraphBuilderNamedLoad) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
 
   ExpectedSnippet<1> snippets[] = {
       {"return p1.val;",
        {factory->NewNumberFromInt(10),
         BytecodeGraphTester::NewObject("({val : 10})")}},
       {"return p1[\"name\"];",
        {factory->NewStringFromStaticChars("abc"),
         BytecodeGraphTester::NewObject("({name : 'abc'})")}},
       {"'use strict'; return p1.val;",
@@ skipping 10 matching lines @@
        "return p1.name;\n",
        {factory->NewStringFromStaticChars("abc"),
         BytecodeGraphTester::NewObject("({ name : 'abc'})")}},
   };
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     ScopedVector<char> script(2048);
     SNPrintF(script, "function %s(p1) { %s };\n%s(0);", kFunctionName,
              snippets[i].code_snippet, kFunctionName);
 
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     auto callable = tester.GetCallable<Handle<Object>>();
     Handle<Object> return_value =
         callable(snippets[i].parameter(0)).ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 
 TEST(BytecodeGraphBuilderKeyedLoad) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
 
   ExpectedSnippet<2> snippets[] = {
       {"return p1[p2];",
        {factory->NewNumberFromInt(10),
         BytecodeGraphTester::NewObject("({val : 10})"),
         factory->NewStringFromStaticChars("val")}},
       {"return p1[100];",
        {factory->NewStringFromStaticChars("abc"),
         BytecodeGraphTester::NewObject("({100 : 'abc'})"),
@@ skipping 23 matching lines @@
        {factory->NewStringFromStaticChars("abc"),
         BytecodeGraphTester::NewObject("({ 100 : 'abc'})"),
         factory->NewNumberFromInt(100)}},
   };
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     ScopedVector<char> script(2048);
     SNPrintF(script, "function %s(p1, p2) { %s };\n%s(0);", kFunctionName,
              snippets[i].code_snippet, kFunctionName);
 
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     auto callable = tester.GetCallable<Handle<Object>, Handle<Object>>();
     Handle<Object> return_value =
         callable(snippets[i].parameter(0), snippets[i].parameter(1))
             .ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 void TestBytecodeGraphBuilderNamedStore(size_t shard) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
 
   ExpectedSnippet<1> snippets[] = {
       {"return p1.val = 20;",
        {factory->NewNumberFromInt(20),
         BytecodeGraphTester::NewObject("({val : 10})")}},
       {"p1.type = 'int'; return p1.type;",
        {factory->NewStringFromStaticChars("int"),
         BytecodeGraphTester::NewObject("({val : 10})")}},
       {"p1.name = 'def'; return p1[\"name\"];",
@@ skipping 17 matching lines @@
        {factory->NewStringFromStaticChars("def"),
         BytecodeGraphTester::NewObject("({ name : 'abc'})")}},
   };
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     if ((i % 2) != shard) continue;
     ScopedVector<char> script(3072);
     SNPrintF(script, "function %s(p1) { %s };\n%s({});", kFunctionName,
              snippets[i].code_snippet, kFunctionName);
 
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     auto callable = tester.GetCallable<Handle<Object>>();
     Handle<Object> return_value =
         callable(snippets[i].parameter(0)).ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 SHARD_TEST_BY_2(BytecodeGraphBuilderNamedStore)
 
 void TestBytecodeGraphBuilderKeyedStore(size_t shard) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
 
   ExpectedSnippet<2> snippets[] = {
       {"p1[p2] = 20; return p1[p2];",
        {factory->NewNumberFromInt(20),
         BytecodeGraphTester::NewObject("({val : 10})"),
         factory->NewStringFromStaticChars("val")}},
       {"return p1[100] = 'def';",
        {factory->NewStringFromStaticChars("def"),
         BytecodeGraphTester::NewObject("({100 : 'abc'})"),
@@ skipping 25 matching lines @@
         BytecodeGraphTester::NewObject("({ 100 : 'abc'})"),
         factory->NewNumberFromInt(100)}},
   };
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     if ((i % 2) != shard) continue;
     ScopedVector<char> script(2048);
     SNPrintF(script, "function %s(p1, p2) { %s };\n%s({});", kFunctionName,
              snippets[i].code_snippet, kFunctionName);
 
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     auto callable = tester.GetCallable<Handle<Object>>();
     Handle<Object> return_value =
         callable(snippets[i].parameter(0)).ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 SHARD_TEST_BY_2(BytecodeGraphBuilderKeyedStore)
 
 TEST(BytecodeGraphBuilderPropertyCall) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
 
   ExpectedSnippet<1> snippets[] = {
       {"return p1.func();",
        {factory->NewNumberFromInt(25),
         BytecodeGraphTester::NewObject("({func() { return 25; }})")}},
       {"return p1.func('abc');",
        {factory->NewStringFromStaticChars("abc"),
         BytecodeGraphTester::NewObject("({func(a) { return a; }})")}},
       {"return p1.func(1, 2, 3, 4, 5, 6, 7, 8);",
        {factory->NewNumberFromInt(36),
         BytecodeGraphTester::NewObject(
             "({func(a, b, c, d, e, f, g, h) {\n"
             "  return a + b + c + d + e + f + g + h;}})")}},
   };
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     ScopedVector<char> script(2048);
     SNPrintF(script, "function %s(p1) { %s };\n%s({func() {}});", kFunctionName,
              snippets[i].code_snippet, kFunctionName);
 
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     auto callable = tester.GetCallable<Handle<Object>>();
     Handle<Object> return_value =
         callable(snippets[i].parameter(0)).ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 
 TEST(BytecodeGraphBuilderCallNew) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
 
   ExpectedSnippet<0> snippets[] = {
       {"function counter() { this.count = 20; }\n"
        "function f() {\n"
        "  var c = new counter();\n"
        "  return c.count;\n"
        "}; f()",
        {factory->NewNumberFromInt(20)}},
       {"function counter(arg0) { this.count = 17; this.x = arg0; }\n"
        "function f() {\n"
        "  var c = new counter(6);\n"
        "  return c.count + c.x;\n"
        "}; f()",
        {factory->NewNumberFromInt(23)}},
       {"function counter(arg0, arg1) {\n"
        "  this.count = 17; this.x = arg0; this.y = arg1;\n"
        "}\n"
        "function f() {\n"
        "  var c = new counter(3, 5);\n"
        "  return c.count + c.x + c.y;\n"
        "}; f()",
        {factory->NewNumberFromInt(25)}},
   };
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
-    BytecodeGraphTester tester(isolate, zone, snippets[i].code_snippet);
+    BytecodeGraphTester tester(isolate, snippets[i].code_snippet);
     auto callable = tester.GetCallable<>();
     Handle<Object> return_value = callable().ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 
 TEST(BytecodeGraphBuilderCreateClosure) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
 
   ExpectedSnippet<0> snippets[] = {
       {"function f() {\n"
        "  function counter() { this.count = 20; }\n"
        "  var c = new counter();\n"
        "  return c.count;\n"
        "}; f()",
        {factory->NewNumberFromInt(20)}},
       {"function f() {\n"
        "  function counter(arg0) { this.count = 17; this.x = arg0; }\n"
        "  var c = new counter(6);\n"
        "  return c.count + c.x;\n"
        "}; f()",
        {factory->NewNumberFromInt(23)}},
       {"function f() {\n"
        "  function counter(arg0, arg1) {\n"
        "    this.count = 17; this.x = arg0; this.y = arg1;\n"
        "  }\n"
        "  var c = new counter(3, 5);\n"
        "  return c.count + c.x + c.y;\n"
        "}; f()",
        {factory->NewNumberFromInt(25)}},
   };
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
-    BytecodeGraphTester tester(isolate, zone, snippets[i].code_snippet);
+    BytecodeGraphTester tester(isolate, snippets[i].code_snippet);
     auto callable = tester.GetCallable<>();
     Handle<Object> return_value = callable().ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 
 TEST(BytecodeGraphBuilderCallRuntime) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
 
   ExpectedSnippet<1> snippets[] = {
       {"function f(arg0) { return %MaxSmi(); }\nf()",
        {factory->NewNumberFromInt(Smi::kMaxValue), factory->undefined_value()}},
       {"function f(arg0) { return %IsArray(arg0) }\nf(undefined)",
        {factory->true_value(), BytecodeGraphTester::NewObject("[1, 2, 3]")}},
       {"function f(arg0) { return %Add(arg0, 2) }\nf(1)",
        {factory->NewNumberFromInt(5), factory->NewNumberFromInt(3)}},
       {"function f(arg0) { return %spread_arguments(arg0).length }\nf([])",
        {factory->NewNumberFromInt(3),
         BytecodeGraphTester::NewObject("[1, 2, 3]")}},
   };
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
-    BytecodeGraphTester tester(isolate, zone, snippets[i].code_snippet);
+    BytecodeGraphTester tester(isolate, snippets[i].code_snippet);
     auto callable = tester.GetCallable<Handle<Object>>();
     Handle<Object> return_value =
         callable(snippets[i].parameter(0)).ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 TEST(BytecodeGraphBuilderInvokeIntrinsic) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
 
   ExpectedSnippet<1> snippets[] = {
       {"function f(arg0) { return %_IsJSReceiver(arg0); }\nf()",
        {factory->false_value(), factory->NewNumberFromInt(1)}},
       {"function f(arg0) { return %_IsArray(arg0) }\nf(undefined)",
        {factory->true_value(), BytecodeGraphTester::NewObject("[1, 2, 3]")}},
   };
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
-    BytecodeGraphTester tester(isolate, zone, snippets[i].code_snippet);
+    BytecodeGraphTester tester(isolate, snippets[i].code_snippet);
     auto callable = tester.GetCallable<Handle<Object>>();
     Handle<Object> return_value =
         callable(snippets[i].parameter(0)).ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 void TestBytecodeGraphBuilderGlobals(size_t shard) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
 
   ExpectedSnippet<0> snippets[] = {
       {"var global = 321;\n function f() { return global; };\n f();",
        {factory->NewNumberFromInt(321)}},
       {"var global = 321;\n"
        "function f() { global = 123; return global };\n f();",
        {factory->NewNumberFromInt(123)}},
       {"var global = function() { return 'abc'};\n"
        "function f() { return global(); };\n f();",
@@ skipping 18 matching lines @@
        {factory->NewStringFromStaticChars("xyz")}},
       {"function f() { return typeof(undeclared_var); }\n; f();\n",
        {factory->NewStringFromStaticChars("undefined")}},
       {"var defined_var = 10; function f() { return typeof(defined_var); }\n; "
        "f();\n",
        {factory->NewStringFromStaticChars("number")}},
   };
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     if ((i % 2) != shard) continue;
-    BytecodeGraphTester tester(isolate, zone, snippets[i].code_snippet);
+    BytecodeGraphTester tester(isolate, snippets[i].code_snippet);
     auto callable = tester.GetCallable<>();
     Handle<Object> return_value = callable().ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 SHARD_TEST_BY_2(BytecodeGraphBuilderGlobals)
 
 TEST(BytecodeGraphBuilderToObject) {
   // TODO(mythria): tests for ToObject. Needs ForIn.
 }
 
 
 TEST(BytecodeGraphBuilderToName) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
 
   ExpectedSnippet<0> snippets[] = {
       {"var a = 'val'; var obj = {[a] : 10}; return obj.val;",
        {factory->NewNumberFromInt(10)}},
       {"var a = 20; var obj = {[a] : 10}; return obj['20'];",
        {factory->NewNumberFromInt(10)}},
       {"var a = 20; var obj = {[a] : 10}; return obj[20];",
        {factory->NewNumberFromInt(10)}},
       {"var a = {val:23}; var obj = {[a] : 10}; return obj[a];",
@@ skipping 12 matching lines @@
        "var obj = {[a] : 10};\n"
        "return obj.x;",
        {factory->NewNumberFromInt(10)}},
   };
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     ScopedVector<char> script(1024);
     SNPrintF(script, "function %s() { %s }\n%s({});", kFunctionName,
              snippets[i].code_snippet, kFunctionName);
 
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     auto callable = tester.GetCallable<>();
     Handle<Object> return_value = callable().ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 
 TEST(BytecodeGraphBuilderLogicalNot) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
 
   ExpectedSnippet<1> snippets[] = {
       {"return !p1;",
        {factory->false_value(),
         BytecodeGraphTester::NewObject("({val : 10})")}},
       {"return !p1;", {factory->true_value(), factory->NewNumberFromInt(0)}},
       {"return !p1;", {factory->true_value(), factory->undefined_value()}},
       {"return !p1;", {factory->false_value(), factory->NewNumberFromInt(10)}},
       {"return !p1;", {factory->false_value(), factory->true_value()}},
       {"return !p1;",
        {factory->false_value(), factory->NewStringFromStaticChars("abc")}},
   };
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     ScopedVector<char> script(1024);
     SNPrintF(script, "function %s(p1) { %s }\n%s({});", kFunctionName,
              snippets[i].code_snippet, kFunctionName);
 
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     auto callable = tester.GetCallable<Handle<Object>>();
     Handle<Object> return_value =
         callable(snippets[i].parameter(0)).ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 
 TEST(BytecodeGraphBuilderTypeOf) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
 
   ExpectedSnippet<1> snippets[] = {
       {"return typeof p1;",
        {factory->NewStringFromStaticChars("object"),
         BytecodeGraphTester::NewObject("({val : 10})")}},
       {"return typeof p1;",
        {factory->NewStringFromStaticChars("undefined"),
         factory->undefined_value()}},
       {"return typeof p1;",
        {factory->NewStringFromStaticChars("number"),
         factory->NewNumberFromInt(10)}},
       {"return typeof p1;",
        {factory->NewStringFromStaticChars("boolean"), factory->true_value()}},
       {"return typeof p1;",
        {factory->NewStringFromStaticChars("string"),
         factory->NewStringFromStaticChars("abc")}},
   };
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     ScopedVector<char> script(1024);
     SNPrintF(script, "function %s(p1) { %s }\n%s({});", kFunctionName,
              snippets[i].code_snippet, kFunctionName);
 
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     auto callable = tester.GetCallable<Handle<Object>>();
     Handle<Object> return_value =
         callable(snippets[i].parameter(0)).ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 
 TEST(BytecodeGraphBuilderCountOperation) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
 
   ExpectedSnippet<1> snippets[] = {
       {"return ++p1;",
        {factory->NewNumberFromInt(11), factory->NewNumberFromInt(10)}},
       {"return p1++;",
        {factory->NewNumberFromInt(10), factory->NewNumberFromInt(10)}},
       {"return p1++ + 10;",
        {factory->NewHeapNumber(15.23), factory->NewHeapNumber(5.23)}},
       {"return 20 + ++p1;",
@@ skipping 21 matching lines @@
        {factory->NewNumberFromInt(10), factory->NewNumberFromInt(10)}},
       {"return ++p1;",
        {factory->nan_value(), factory->NewStringFromStaticChars("String")}},
   };
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     ScopedVector<char> script(1024);
     SNPrintF(script, "function %s(p1) { %s }\n%s({});", kFunctionName,
              snippets[i].code_snippet, kFunctionName);
 
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     auto callable = tester.GetCallable<Handle<Object>>();
     Handle<Object> return_value =
         callable(snippets[i].parameter(0)).ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 
 TEST(BytecodeGraphBuilderDelete) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
 
   ExpectedSnippet<1> snippets[] = {
       {"return delete p1.val;",
        {factory->true_value(), BytecodeGraphTester::NewObject("({val : 10})")}},
       {"delete p1.val; return p1.val;",
        {factory->undefined_value(),
         BytecodeGraphTester::NewObject("({val : 10})")}},
       {"delete p1.name; return p1.val;",
        {factory->NewNumberFromInt(10),
         BytecodeGraphTester::NewObject("({val : 10, name:'abc'})")}},
       {"'use strict'; return delete p1.val;",
        {factory->true_value(), BytecodeGraphTester::NewObject("({val : 10})")}},
       {"'use strict'; delete p1.val; return p1.val;",
        {factory->undefined_value(),
         BytecodeGraphTester::NewObject("({val : 10})")}},
       {"'use strict'; delete p1.name; return p1.val;",
        {factory->NewNumberFromInt(10),
         BytecodeGraphTester::NewObject("({val : 10, name:'abc'})")}},
   };
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     ScopedVector<char> script(1024);
     SNPrintF(script, "function %s(p1) { %s }\n%s({});", kFunctionName,
              snippets[i].code_snippet, kFunctionName);
 
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     auto callable = tester.GetCallable<Handle<Object>>();
     Handle<Object> return_value =
         callable(snippets[i].parameter(0)).ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 
 TEST(BytecodeGraphBuilderDeleteGlobal) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
 
   ExpectedSnippet<0> snippets[] = {
       {"var obj = {val : 10, type : 'int'};"
        "function f() {return delete obj;};",
        {factory->false_value()}},
       {"function f() {return delete this;};", {factory->true_value()}},
       {"var obj = {val : 10, type : 'int'};"
        "function f() {return delete obj.val;};",
        {factory->true_value()}},
@@ skipping 20 matching lines @@
        "  function inner() { return obj[1]; };"
        "  return delete obj[1];"
        "}",
        {factory->true_value()}},
   };
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     ScopedVector<char> script(1024);
     SNPrintF(script, "%s %s({});", snippets[i].code_snippet, kFunctionName);
 
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     auto callable = tester.GetCallable<>();
     Handle<Object> return_value = callable().ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 
 TEST(BytecodeGraphBuilderDeleteLookupSlot) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
 
   // TODO(mythria): Add more tests when we have support for LdaLookupSlot.
   const char* function_prologue = "var f;"
                                   "var x = 1;"
                                   "y = 10;"
                                   "var obj = {val:10};"
                                   "var z = 30;"
                                   "function f1() {"
                                   "  var z = 20;"
                                   "  eval(\"function t() {";
   const char* function_epilogue = "        }; f = t; t();\");"
                                   "}"
                                   "f1();";
 
   ExpectedSnippet<0> snippets[] = {
       {"return delete y;", {factory->true_value()}},
       {"return delete z;", {factory->false_value()}},
   };
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     ScopedVector<char> script(1024);
     SNPrintF(script, "%s %s %s", function_prologue, snippets[i].code_snippet,
              function_epilogue);
 
-    BytecodeGraphTester tester(isolate, zone, script.start(), "t");
+    BytecodeGraphTester tester(isolate, script.start(), "t");
     auto callable = tester.GetCallable<>();
     Handle<Object> return_value = callable().ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 
 TEST(BytecodeGraphBuilderLookupSlot) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
 
   const char* function_prologue = "var f;"
                                   "var x = 12;"
                                   "y = 10;"
                                   "var obj = {val:3.1414};"
                                   "var z = 30;"
                                   "function f1() {"
                                   "  var z = 20;"
                                   "  eval(\"function t() {";
   const char* function_epilogue = "        }; f = t; t();\");"
                                   "}"
                                   "f1();";
 
   ExpectedSnippet<0> snippets[] = {
       {"return x;", {factory->NewNumber(12)}},
       {"return obj.val;", {factory->NewNumber(3.1414)}},
       {"return typeof x;", {factory->NewStringFromStaticChars("number")}},
       {"return typeof dummy;",
        {factory->NewStringFromStaticChars("undefined")}},
       {"x = 23; return x;", {factory->NewNumber(23)}},
       {"'use strict'; obj.val = 23.456; return obj.val;",
        {factory->NewNumber(23.456)}}};
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     ScopedVector<char> script(1024);
     SNPrintF(script, "%s %s %s", function_prologue, snippets[i].code_snippet,
              function_epilogue);
 
-    BytecodeGraphTester tester(isolate, zone, script.start(), "t");
+    BytecodeGraphTester tester(isolate, script.start(), "t");
     auto callable = tester.GetCallable<>();
     Handle<Object> return_value = callable().ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 TEST(BytecodeGraphBuilderLookupContextSlot) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
 
   // Testing with eval called in the current context.
   const char* inner_eval_prologue = "var x = 0; function inner() {";
   const char* inner_eval_epilogue = "}; return inner();";
 
   ExpectedSnippet<0> inner_eval_snippets[] = {
       {"eval(''); return x;", {factory->NewNumber(0)}},
       {"eval('var x = 1'); return x;", {factory->NewNumber(1)}},
       {"'use strict'; eval('var x = 1'); return x;", {factory->NewNumber(0)}}};
 
   for (size_t i = 0; i < arraysize(inner_eval_snippets); i++) {
     ScopedVector<char> script(1024);
     SNPrintF(script, "function %s(p1) { %s %s %s } ; %s() ;", kFunctionName,
              inner_eval_prologue, inner_eval_snippets[i].code_snippet,
              inner_eval_epilogue, kFunctionName);
 
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     auto callable = tester.GetCallable<>();
     Handle<Object> return_value = callable().ToHandleChecked();
     CHECK(return_value->SameValue(*inner_eval_snippets[i].return_value()));
   }
 
   // Testing with eval called in a parent context.
   const char* outer_eval_prologue = "";
   const char* outer_eval_epilogue =
       "function inner() { return x; }; return inner();";
 
   ExpectedSnippet<0> outer_eval_snippets[] = {
       {"var x = 0; eval('');", {factory->NewNumber(0)}},
       {"var x = 0; eval('var x = 1');", {factory->NewNumber(1)}},
       {"'use strict'; var x = 0; eval('var x = 1');", {factory->NewNumber(0)}}};
 
   for (size_t i = 0; i < arraysize(outer_eval_snippets); i++) {
     ScopedVector<char> script(1024);
     SNPrintF(script, "function %s() { %s %s %s } ; %s() ;", kFunctionName,
              outer_eval_prologue, outer_eval_snippets[i].code_snippet,
              outer_eval_epilogue, kFunctionName);
 
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     auto callable = tester.GetCallable<>();
     Handle<Object> return_value = callable().ToHandleChecked();
     CHECK(return_value->SameValue(*outer_eval_snippets[i].return_value()));
   }
 }
 
 TEST(BytecodeGraphBuilderLookupGlobalSlot) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
 
   // Testing with eval called in the current context.
   const char* inner_eval_prologue = "x = 0; function inner() {";
   const char* inner_eval_epilogue = "}; return inner();";
 
   ExpectedSnippet<0> inner_eval_snippets[] = {
       {"eval(''); return x;", {factory->NewNumber(0)}},
       {"eval('var x = 1'); return x;", {factory->NewNumber(1)}},
       {"'use strict'; eval('var x = 1'); return x;", {factory->NewNumber(0)}}};
 
   for (size_t i = 0; i < arraysize(inner_eval_snippets); i++) {
     ScopedVector<char> script(1024);
     SNPrintF(script, "function %s(p1) { %s %s %s } ; %s() ;", kFunctionName,
              inner_eval_prologue, inner_eval_snippets[i].code_snippet,
              inner_eval_epilogue, kFunctionName);
 
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     auto callable = tester.GetCallable<>();
     Handle<Object> return_value = callable().ToHandleChecked();
     CHECK(return_value->SameValue(*inner_eval_snippets[i].return_value()));
   }
 
   // Testing with eval called in a parent context.
   const char* outer_eval_prologue = "";
   const char* outer_eval_epilogue =
       "function inner() { return x; }; return inner();";
 
   ExpectedSnippet<0> outer_eval_snippets[] = {
       {"x = 0; eval('');", {factory->NewNumber(0)}},
       {"x = 0; eval('var x = 1');", {factory->NewNumber(1)}},
       {"'use strict'; x = 0; eval('var x = 1');", {factory->NewNumber(0)}}};
 
   for (size_t i = 0; i < arraysize(outer_eval_snippets); i++) {
     ScopedVector<char> script(1024);
     SNPrintF(script, "function %s() { %s %s %s } ; %s() ;", kFunctionName,
              outer_eval_prologue, outer_eval_snippets[i].code_snippet,
              outer_eval_epilogue, kFunctionName);
 
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     auto callable = tester.GetCallable<>();
     Handle<Object> return_value = callable().ToHandleChecked();
     CHECK(return_value->SameValue(*outer_eval_snippets[i].return_value()));
   }
 }
 
 TEST(BytecodeGraphBuilderLookupSlotWide) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
 
   const char* function_prologue =
       "var f;"
       "var x = 12;"
       "y = 10;"
       "var obj = {val:3.1414};"
       "var z = 30;"
       "function f1() {"
       "  var z = 20;"
@@ skipping 11 matching lines @@
       {"var y = 2.3;" REPEAT_256(SPACE, "y = 2.3;") "return x = 23;",
        {factory->NewNumber(23)}},
       {"'use strict';" REPEAT_256(SPACE, "y = 2.3;") "return obj.val = 23.456;",
        {factory->NewNumber(23.456)}}};
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     ScopedVector<char> script(3072);
     SNPrintF(script, "%s %s %s", function_prologue, snippets[i].code_snippet,
              function_epilogue);
 
-    BytecodeGraphTester tester(isolate, zone, script.start(), "t");
+    BytecodeGraphTester tester(isolate, script.start(), "t");
     auto callable = tester.GetCallable<>();
     Handle<Object> return_value = callable().ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 
 TEST(BytecodeGraphBuilderCallLookupSlot) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
 
   ExpectedSnippet<0> snippets[] = {
       {"g = function(){ return 2 }; eval(''); return g();",
        {handle(Smi::FromInt(2), isolate)}},
       {"g = function(){ return 2 }; eval('g = function() {return 3}');\n"
        "return g();",
        {handle(Smi::FromInt(3), isolate)}},
       {"g = { x: function(){ return this.y }, y: 20 };\n"
        "eval('g = { x: g.x, y: 30 }');\n"
        "return g.x();",
        {handle(Smi::FromInt(30), isolate)}},
   };
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     ScopedVector<char> script(1024);
     SNPrintF(script, "function %s() { %s }\n%s();", kFunctionName,
              snippets[i].code_snippet, kFunctionName);
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     auto callable = tester.GetCallable<>();
     Handle<Object> return_value = callable().ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 
 TEST(BytecodeGraphBuilderEval) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
 
   ExpectedSnippet<0> snippets[] = {
       {"return eval('1;');", {handle(Smi::FromInt(1), isolate)}},
       {"return eval('100 * 20;');", {handle(Smi::FromInt(2000), isolate)}},
       {"var x = 10; return eval('x + 20;');",
        {handle(Smi::FromInt(30), isolate)}},
       {"var x = 10; eval('x = 33;'); return x;",
        {handle(Smi::FromInt(33), isolate)}},
       {"'use strict'; var x = 20; var z = 0;\n"
@@ skipping 20 matching lines @@
       {"var x = {}; eval('var x = 10;'); return typeof x;",
        {factory->NewStringFromStaticChars("number")}},
       {"'use strict'; var x = {}; eval('var x = 10;'); return typeof x;",
        {factory->NewStringFromStaticChars("object")}},
   };
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     ScopedVector<char> script(1024);
     SNPrintF(script, "function %s() { %s }\n%s();", kFunctionName,
              snippets[i].code_snippet, kFunctionName);
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     auto callable = tester.GetCallable<>();
     Handle<Object> return_value = callable().ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 
 TEST(BytecodeGraphBuilderEvalParams) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
 
   ExpectedSnippet<1> snippets[] = {
       {"var x = 10; return eval('x + p1;');",
        {handle(Smi::FromInt(30), isolate), handle(Smi::FromInt(20), isolate)}},
       {"var x = 10; eval('p1 = x;'); return p1;",
        {handle(Smi::FromInt(10), isolate), handle(Smi::FromInt(20), isolate)}},
       {"var a = 10;"
        "function inner() { return eval('a + p1;');}"
        "return inner();",
        {handle(Smi::FromInt(30), isolate), handle(Smi::FromInt(20), isolate)}},
   };
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     ScopedVector<char> script(1024);
     SNPrintF(script, "function %s(p1) { %s }\n%s(0);", kFunctionName,
              snippets[i].code_snippet, kFunctionName);
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     auto callable = tester.GetCallable<Handle<Object>>();
     Handle<Object> return_value =
         callable(snippets[i].parameter(0)).ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 
 TEST(BytecodeGraphBuilderEvalGlobal) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
 
   ExpectedSnippet<0> snippets[] = {
       {"function add_global() { eval('function f() { z = 33; }; f()'); };"
        "function f() { add_global(); return z; }; f();",
        {handle(Smi::FromInt(33), isolate)}},
       {"function add_global() {\n"
        " eval('\"use strict\"; function f() { y = 33; };"
        "      try { f() } catch(e) {}');\n"
        "}\n"
        "function f() { add_global(); return typeof y; } f();",
        {factory->NewStringFromStaticChars("undefined")}},
   };
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
-    BytecodeGraphTester tester(isolate, zone, snippets[i].code_snippet);
+    BytecodeGraphTester tester(isolate, snippets[i].code_snippet);
     auto callable = tester.GetCallable<>();
     Handle<Object> return_value = callable().ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 
 bool get_compare_result(Token::Value opcode, Handle<Object> lhs_value,
                         Handle<Object> rhs_value) {
   switch (opcode) {
@@ skipping 41 matching lines @@
     default:
       UNREACHABLE();
       return "";
   }
 }
 
 
 TEST(BytecodeGraphBuilderCompare) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
   Handle<Object> lhs_values[] = {
       factory->NewNumberFromInt(10), factory->NewHeapNumber(3.45),
       factory->NewStringFromStaticChars("abc"),
       factory->NewNumberFromInt(SMI_MAX), factory->NewNumberFromInt(SMI_MIN)};
   Handle<Object> rhs_values[] = {factory->NewNumberFromInt(10),
                                  factory->NewStringFromStaticChars("10"),
                                  factory->NewNumberFromInt(20),
                                  factory->NewStringFromStaticChars("abc"),
                                  factory->NewHeapNumber(3.45),
                                  factory->NewNumberFromInt(SMI_MAX),
                                  factory->NewNumberFromInt(SMI_MIN)};
 
   for (size_t i = 0; i < arraysize(kCompareOperators); i++) {
     ScopedVector<char> script(1024);
     SNPrintF(script, "function %s(p1, p2) { %s }\n%s({}, {});", kFunctionName,
              get_code_snippet(kCompareOperators[i]), kFunctionName);
 
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     auto callable = tester.GetCallable<Handle<Object>, Handle<Object>>();
     for (size_t j = 0; j < arraysize(lhs_values); j++) {
       for (size_t k = 0; k < arraysize(rhs_values); k++) {
         Handle<Object> return_value =
             callable(lhs_values[j], rhs_values[k]).ToHandleChecked();
         bool result = get_compare_result(kCompareOperators[i], lhs_values[j],
                                          rhs_values[k]);
         CHECK(return_value->SameValue(*factory->ToBoolean(result)));
       }
     }
   }
 }
 
 
 TEST(BytecodeGraphBuilderTestIn) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
 
   ExpectedSnippet<2> snippets[] = {
       {"return p2 in p1;",
        {factory->true_value(), BytecodeGraphTester::NewObject("({val : 10})"),
         factory->NewStringFromStaticChars("val")}},
       {"return p2 in p1;",
        {factory->true_value(), BytecodeGraphTester::NewObject("[]"),
         factory->NewStringFromStaticChars("length")}},
       {"return p2 in p1;",
@@ skipping 15 matching lines @@
        {factory->false_value(),
         BytecodeGraphTester::NewObject("({10 : 'val'})"),
         factory->NewNumberFromInt(1)}},
   };
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     ScopedVector<char> script(1024);
     SNPrintF(script, "function %s(p1, p2) { %s }\n%s({}, {});", kFunctionName,
              snippets[i].code_snippet, kFunctionName);
 
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     auto callable = tester.GetCallable<Handle<Object>, Handle<Object>>();
     Handle<Object> return_value =
         callable(snippets[i].parameter(0), snippets[i].parameter(1))
             .ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 
 TEST(BytecodeGraphBuilderTestInstanceOf) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
 
   ExpectedSnippet<1> snippets[] = {
       {"return p1 instanceof Object;",
        {factory->true_value(), BytecodeGraphTester::NewObject("({val : 10})")}},
       {"return p1 instanceof String;",
        {factory->false_value(), factory->NewStringFromStaticChars("string")}},
       {"var cons = function() {};"
        "var obj = new cons();"
        "return obj instanceof cons;",
        {factory->true_value(), factory->undefined_value()}},
   };
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     ScopedVector<char> script(1024);
     SNPrintF(script, "function %s(p1) { %s }\n%s({});", kFunctionName,
              snippets[i].code_snippet, kFunctionName);
 
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     auto callable = tester.GetCallable<Handle<Object>>();
     Handle<Object> return_value =
         callable(snippets[i].parameter(0)).ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 TEST(BytecodeGraphBuilderTryCatch) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
 
   ExpectedSnippet<0> snippets[] = {
       {"var a = 1; try { a = 2 } catch(e) { a = 3 }; return a;",
        {handle(Smi::FromInt(2), isolate)}},
       {"var a; try { undef.x } catch(e) { a = 2 }; return a;",
        {handle(Smi::FromInt(2), isolate)}},
       {"var a; try { throw 1 } catch(e) { a = e + 2 }; return a;",
        {handle(Smi::FromInt(3), isolate)}},
       {"var a; try { throw 1 } catch(e) { a = e + 2 };"
        "       try { throw a } catch(e) { a = e + 3 }; return a;",
        {handle(Smi::FromInt(6), isolate)}},
   };
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     ScopedVector<char> script(1024);
     SNPrintF(script, "function %s() { %s }\n%s();", kFunctionName,
              snippets[i].code_snippet, kFunctionName);
 
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     auto callable = tester.GetCallable<>();
     Handle<Object> return_value = callable().ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 TEST(BytecodeGraphBuilderTryFinally1) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
 
   ExpectedSnippet<0> snippets[] = {
       {"var a = 1; try { a = a + 1; } finally { a = a + 2; }; return a;",
        {handle(Smi::FromInt(4), isolate)}},
       {"var a = 1; try { a = 2; return 23; } finally { a = 3 }; return a;",
        {handle(Smi::FromInt(23), isolate)}},
       {"var a = 1; try { a = 2; throw 23; } finally { return a; };",
        {handle(Smi::FromInt(2), isolate)}},
       {"var a = 1; for (var i = 10; i < 20; i += 5) {"
        "  try { a = 2; break; } finally { a = 3; }"
        "} return a + i;",
        {handle(Smi::FromInt(13), isolate)}},
       {"var a = 1; for (var i = 10; i < 20; i += 5) {"
        "  try { a = 2; continue; } finally { a = 3; }"
        "} return a + i;",
        {handle(Smi::FromInt(23), isolate)}},
       {"var a = 1; try { a = 2;"
        "  try { a = 3; throw 23; } finally { a = 4; }"
        "} catch(e) { a = a + e; } return a;",
        {handle(Smi::FromInt(27), isolate)}},
   };
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     ScopedVector<char> script(1024);
     SNPrintF(script, "function %s() { %s }\n%s();", kFunctionName,
              snippets[i].code_snippet, kFunctionName);
 
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     auto callable = tester.GetCallable<>();
     Handle<Object> return_value = callable().ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 TEST(BytecodeGraphBuilderTryFinally2) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
 
   ExpectedSnippet<0, const char*> snippets[] = {
       {"var a = 1; try { a = 2; throw 23; } finally { a = 3 }; return a;",
        {"Uncaught 23"}},
       {"var a = 1; try { a = 2; throw 23; } finally { throw 42; };",
        {"Uncaught 42"}},
   };
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     ScopedVector<char> script(1024);
     SNPrintF(script, "function %s() { %s }\n%s();", kFunctionName,
              snippets[i].code_snippet, kFunctionName);
 
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     v8::Local<v8::String> message = tester.CheckThrowsReturnMessage()->Get();
     v8::Local<v8::String> expected_string = v8_str(snippets[i].return_value());
     CHECK(
         message->Equals(CcTest::isolate()->GetCurrentContext(), expected_string)
             .FromJust());
   }
 }
 
 TEST(BytecodeGraphBuilderThrow) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
 
   // TODO(mythria): Add more tests when real try-catch and deoptimization
   // information are supported.
   ExpectedSnippet<0, const char*> snippets[] = {
       {"throw undefined;", {"Uncaught undefined"}},
       {"throw 1;", {"Uncaught 1"}},
       {"throw 'Error';", {"Uncaught Error"}},
       {"throw 'Error1'; throw 'Error2'", {"Uncaught Error1"}},
       {"var a = true; if (a) { throw 'Error'; }", {"Uncaught Error"}},
   };
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     ScopedVector<char> script(1024);
     SNPrintF(script, "function %s() { %s }\n%s();", kFunctionName,
              snippets[i].code_snippet, kFunctionName);
 
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     v8::Local<v8::String> message = tester.CheckThrowsReturnMessage()->Get();
     v8::Local<v8::String> expected_string = v8_str(snippets[i].return_value());
     CHECK(
         message->Equals(CcTest::isolate()->GetCurrentContext(), expected_string)
             .FromJust());
   }
 }
 
 
 TEST(BytecodeGraphBuilderContext) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
 
   ExpectedSnippet<0> snippets[] = {
       {"var x = 'outer';"
        "function f() {"
        " 'use strict';"
        " {"
        "   let x = 'inner';"
        "   (function() {x});"
        " }"
@@ skipping 27 matching lines @@
        " return(innerMostFunc() + x);"
        "}"
        "f();",
        {factory->NewStringFromStaticChars("innermost inner_changed outer")}},
   };
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     ScopedVector<char> script(1024);
     SNPrintF(script, "%s", snippets[i].code_snippet);
 
-    BytecodeGraphTester tester(isolate, zone, script.start(), "f");
+    BytecodeGraphTester tester(isolate, script.start(), "f");
     auto callable = tester.GetCallable<>("f");
     Handle<Object> return_value = callable().ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 
 TEST(BytecodeGraphBuilderLoadContext) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
 
   ExpectedSnippet<1> snippets[] = {
       {"function Outer() {"
        "  var outerVar = 2;"
        "  function Inner(innerArg) {"
        "    this.innerFunc = function () {"
        "     return outerVar * innerArg;"
        "    };"
        "  };"
@@ skipping 33 matching lines @@
        " }"
        "}"
        "var f = new testOuter(10).testinnerFunc;"
        "f(0);",
        {factory->NewNumberFromInt(24), factory->NewNumberFromInt(4)}}};
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     ScopedVector<char> script(1024);
     SNPrintF(script, "%s", snippets[i].code_snippet);
 
-    BytecodeGraphTester tester(isolate, zone, script.start(), "*");
+    BytecodeGraphTester tester(isolate, script.start(), "*");
     auto callable = tester.GetCallable<Handle<Object>>("f");
     Handle<Object> return_value =
         callable(snippets[i].parameter(0)).ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 
 TEST(BytecodeGraphBuilderCreateArgumentsNoParameters) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
 
   ExpectedSnippet<0> snippets[] = {
       {"function f() {return arguments[0];}", {factory->undefined_value()}},
       {"function f(a) {return arguments[0];}", {factory->undefined_value()}},
       {"function f() {'use strict'; return arguments[0];}",
        {factory->undefined_value()}},
       {"function f(a) {'use strict'; return arguments[0];}",
        {factory->undefined_value()}},
       {"function f(...restArgs) {return restArgs[0];}",
        {factory->undefined_value()}},
       {"function f(a, ...restArgs) {return restArgs[0];}",
        {factory->undefined_value()}},
   };
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     ScopedVector<char> script(1024);
     SNPrintF(script, "%s\n%s();", snippets[i].code_snippet, kFunctionName);
 
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     auto callable = tester.GetCallable<>();
     Handle<Object> return_value = callable().ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 
 TEST(BytecodeGraphBuilderCreateArguments) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
 
   ExpectedSnippet<3> snippets[] = {
       {"function f(a, b, c) {return arguments[0];}",
        {factory->NewNumberFromInt(1), factory->NewNumberFromInt(1),
         factory->NewNumberFromInt(2), factory->NewNumberFromInt(3)}},
       {"function f(a, b, c) {return arguments[3];}",
        {factory->undefined_value(), factory->NewNumberFromInt(1),
         factory->NewNumberFromInt(2), factory->NewNumberFromInt(3)}},
       {"function f(a, b, c) { b = c; return arguments[1];}",
@@ skipping 11 matching lines @@
       {"function inline_func(a, b) { return arguments[0] }"
        "function f(a, b, c) {return inline_func(b, c) + arguments[0];}",
        {factory->NewNumberFromInt(3), factory->NewNumberFromInt(1),
         factory->NewNumberFromInt(2), factory->NewNumberFromInt(30)}},
   };
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     ScopedVector<char> script(1024);
     SNPrintF(script, "%s\n%s();", snippets[i].code_snippet, kFunctionName);
 
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     auto callable =
         tester.GetCallable<Handle<Object>, Handle<Object>, Handle<Object>>();
     Handle<Object> return_value =
         callable(snippets[i].parameter(0), snippets[i].parameter(1),
                  snippets[i].parameter(2))
             .ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 TEST(BytecodeGraphBuilderCreateRestArguments) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
 
   ExpectedSnippet<3> snippets[] = {
       {"function f(...restArgs) {return restArgs[0];}",
        {factory->NewNumberFromInt(1), factory->NewNumberFromInt(1),
         factory->NewNumberFromInt(2), factory->NewNumberFromInt(3)}},
       {"function f(a, b, ...restArgs) {return restArgs[0];}",
        {factory->NewNumberFromInt(3), factory->NewNumberFromInt(1),
         factory->NewNumberFromInt(2), factory->NewNumberFromInt(3)}},
       {"function f(a, b, ...restArgs) {return arguments[2];}",
        {factory->NewNumberFromInt(3), factory->NewNumberFromInt(1),
         factory->NewNumberFromInt(2), factory->NewNumberFromInt(3)}},
       {"function f(a, ...restArgs) { return restArgs[2];}",
        {factory->undefined_value(), factory->NewNumberFromInt(1),
         factory->NewNumberFromInt(2), factory->NewNumberFromInt(3)}},
       {"function f(a, ...restArgs) { return arguments[0] + restArgs[1];}",
        {factory->NewNumberFromInt(4), factory->NewNumberFromInt(1),
         factory->NewNumberFromInt(2), factory->NewNumberFromInt(3)}},
       {"function inline_func(a, ...restArgs) { return restArgs[0] }"
        "function f(a, b, c) {return inline_func(b, c) + arguments[0];}",
        {factory->NewNumberFromInt(31), factory->NewNumberFromInt(1),
         factory->NewNumberFromInt(2), factory->NewNumberFromInt(30)}},
   };
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     ScopedVector<char> script(1024);
     SNPrintF(script, "%s\n%s();", snippets[i].code_snippet, kFunctionName);
 
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     auto callable =
         tester.GetCallable<Handle<Object>, Handle<Object>, Handle<Object>>();
     Handle<Object> return_value =
         callable(snippets[i].parameter(0), snippets[i].parameter(1),
                  snippets[i].parameter(2))
             .ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 TEST(BytecodeGraphBuilderRegExpLiterals) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
 
   ExpectedSnippet<0> snippets[] = {
       {"return /abd/.exec('cccabbdd');", {factory->null_value()}},
       {"return /ab+d/.exec('cccabbdd')[0];",
        {factory->NewStringFromStaticChars("abbd")}},
       {"var a = 3.1414;"
        REPEAT_256(SPACE, "a = 3.1414;")
        "return /ab+d/.exec('cccabbdd')[0];",
        {factory->NewStringFromStaticChars("abbd")}},
       {"return /ab+d/.exec('cccabbdd')[1];", {factory->undefined_value()}},
       {"return /AbC/i.exec('ssaBC')[0];",
        {factory->NewStringFromStaticChars("aBC")}},
       {"return 'ssaBC'.match(/AbC/i)[0];",
        {factory->NewStringFromStaticChars("aBC")}},
       {"return 'ssaBCtAbC'.match(/(AbC)/gi)[1];",
        {factory->NewStringFromStaticChars("AbC")}},
   };
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     ScopedVector<char> script(4096);
     SNPrintF(script, "function %s() { %s }\n%s();", kFunctionName,
              snippets[i].code_snippet, kFunctionName);
 
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     auto callable = tester.GetCallable<>();
     Handle<Object> return_value = callable().ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 
 TEST(BytecodeGraphBuilderArrayLiterals) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
 
   ExpectedSnippet<0> snippets[] = {
       {"return [][0];", {factory->undefined_value()}},
       {"return [1, 3, 2][1];", {factory->NewNumberFromInt(3)}},
       {"var a;" REPEAT_256(SPACE, "a = 9.87;") "return [1, 3, 2][1];",
        {factory->NewNumberFromInt(3)}},
       {"return ['a', 'b', 'c'][2];", {factory->NewStringFromStaticChars("c")}},
       {"var a = 100; return [a, a++, a + 2, a + 3][2];",
        {factory->NewNumberFromInt(103)}},
       {"var a = 100; return [a, ++a, a + 2, a + 3][1];",
        {factory->NewNumberFromInt(101)}},
       {"var a = 9.2;"
        REPEAT_256(SPACE, "a = 9.34;")
        "return [a, ++a, a + 2, a + 3][2];",
        {factory->NewHeapNumber(12.34)}},
       {"return [[1, 2, 3], ['a', 'b', 'c']][1][0];",
        {factory->NewStringFromStaticChars("a")}},
       {"var t = 't'; return [[t, t + 'est'], [1 + t]][0][1];",
        {factory->NewStringFromStaticChars("test")}},
       {"var t = 't'; return [[t, t + 'est'], [1 + t]][1][0];",
        {factory->NewStringFromStaticChars("1t")}}};
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     ScopedVector<char> script(4096);
     SNPrintF(script, "function %s() { %s }\n%s();", kFunctionName,
              snippets[i].code_snippet, kFunctionName);
 
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     auto callable = tester.GetCallable<>();
     Handle<Object> return_value = callable().ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 
 TEST(BytecodeGraphBuilderObjectLiterals) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
 
   ExpectedSnippet<0> snippets[] = {
       {"return { }.name;", {factory->undefined_value()}},
       {"return { name: 'string', val: 9.2 }.name;",
        {factory->NewStringFromStaticChars("string")}},
       {"var a;\n"
        REPEAT_256(SPACE, "a = 1.23;\n")
        "return { name: 'string', val: 9.2 }.name;",
        {factory->NewStringFromStaticChars("string")}},
@@ skipping 32 matching lines @@
        {factory->NewStringFromStaticChars("proto_str")}},
       {"var n = 'name';\n"
        "return { [n]: 'val', get a() { return 987 } }['a'];",
        {factory->NewNumberFromInt(987)}},
   };
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     ScopedVector<char> script(4096);
     SNPrintF(script, "function %s() { %s }\n%s();", kFunctionName,
              snippets[i].code_snippet, kFunctionName);
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     auto callable = tester.GetCallable<>();
     Handle<Object> return_value = callable().ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 
 TEST(BytecodeGraphBuilderIf) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
 
   ExpectedSnippet<1> snippets[] = {
       {"if (p1 > 1) return 1;\n"
        "return -1;",
        {factory->NewNumberFromInt(1), factory->NewNumberFromInt(2)}},
       {"if (p1 > 1) return 1;\n"
        "return -1;",
        {factory->NewNumberFromInt(-1), factory->NewNumberFromInt(1)}},
       {"if (p1 > 1) { return 1; } else { return -1; }",
@@ skipping 77 matching lines @@
        "function f1() {x}"
        "return x + c;",
        {factory->NewNumberFromInt(5), factory->NewNumberFromInt(-1)}},
   };
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     ScopedVector<char> script(2048);
     SNPrintF(script, "function %s(p1) { %s };\n%s(0);", kFunctionName,
              snippets[i].code_snippet, kFunctionName);
 
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     auto callable = tester.GetCallable<Handle<Object>>();
     Handle<Object> return_value =
         callable(snippets[i].parameter(0)).ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 
 TEST(BytecodeGraphBuilderConditionalOperator) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
 
   ExpectedSnippet<1> snippets[] = {
       {"return (p1 > 1) ? 1 : -1;",
        {factory->NewNumberFromInt(1), factory->NewNumberFromInt(2)}},
       {"return (p1 > 1) ? 1 : -1;",
        {factory->NewNumberFromInt(-1), factory->NewNumberFromInt(0)}},
       {"return (p1 > 50) ? 1 : ((p1 < 10) ? 10 : -10);",
        {factory->NewNumberFromInt(10), factory->NewNumberFromInt(2)}},
       {"return (p1 > 50) ? 1 : ((p1 < 10) ? 10 : -10);",
        {factory->NewNumberFromInt(-10), factory->NewNumberFromInt(20)}},
   };
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     ScopedVector<char> script(2048);
     SNPrintF(script, "function %s(p1) { %s };\n%s(0);", kFunctionName,
              snippets[i].code_snippet, kFunctionName);
 
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     auto callable = tester.GetCallable<Handle<Object>>();
     Handle<Object> return_value =
         callable(snippets[i].parameter(0)).ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 
 TEST(BytecodeGraphBuilderSwitch) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
 
   const char* switch_code =
       "switch (p1) {\n"
       "  case 1: return 0;\n"
       "  case 2: return 1;\n"
       "  case 3:\n"
       "  case 4: return 2;\n"
       "  case 9: break;\n"
       "  default: return 3;\n"
@@ skipping 15 matching lines @@
        {factory->NewNumberFromInt(3), factory->NewNumberFromInt(5)}},
       {switch_code,
        {factory->NewNumberFromInt(3), factory->NewNumberFromInt(6)}},
   };
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     ScopedVector<char> script(2048);
     SNPrintF(script, "function %s(p1) { %s };\n%s(0);", kFunctionName,
              snippets[i].code_snippet, kFunctionName);
 
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     auto callable = tester.GetCallable<Handle<Object>>();
     Handle<Object> return_value =
         callable(snippets[i].parameter(0)).ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 TEST(BytecodeGraphBuilderSwitchMerge) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
 
   const char* switch_code =
       "var x = 10;"
       "switch (p1) {\n"
       "  case 1: x = 0;\n"
       "  case 2: x = 1;\n"
       "  case 3:\n"
       "  case 4: x = 2; break;\n"
       "  case 5: x = 3;\n"
@@ skipping 17 matching lines @@
        {factory->NewNumberFromInt(10), factory->NewNumberFromInt(9)}},
       {switch_code,
        {factory->NewNumberFromInt(4), factory->NewNumberFromInt(6)}},
   };
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     ScopedVector<char> script(2048);
     SNPrintF(script, "function %s(p1) { %s };\n%s(0);", kFunctionName,
              snippets[i].code_snippet, kFunctionName);
 
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     auto callable = tester.GetCallable<Handle<Object>>();
     Handle<Object> return_value =
         callable(snippets[i].parameter(0)).ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 TEST(BytecodeGraphBuilderNestedSwitch) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
 
   const char* switch_code =
       "switch (p1) {\n"
       "  case 0: {"
       "    switch (p2) { case 0: return 0; case 1: return 1; case 2: break; }\n"
       "    return -1;"
       "  }\n"
       "  case 1: {"
       "    switch (p2) { case 0: return 2; case 1: return 3; }\n"
@@ skipping 27 matching lines @@
       {switch_code,
        {factory->NewNumberFromInt(-2), factory->NewNumberFromInt(2),
         factory->NewNumberFromInt(0)}},
   };
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     ScopedVector<char> script(2048);
     SNPrintF(script, "function %s(p1, p2) { %s };\n%s(0, 0);", kFunctionName,
              snippets[i].code_snippet, kFunctionName);
 
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     auto callable = tester.GetCallable<Handle<Object>, Handle<Object>>();
     Handle<Object> return_value =
         callable(snippets[i].parameter(0), snippets[i].parameter(1))
             .ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 
 TEST(BytecodeGraphBuilderBreakableBlocks) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
 
   ExpectedSnippet<0> snippets[] = {
       {"var x = 0;\n"
        "my_heart: {\n"
        "  x = x + 1;\n"
        "  break my_heart;\n"
        "  x = x + 2;\n"
        "}\n"
        "return x;\n",
        {factory->NewNumberFromInt(1)}},
       {"var sum = 0;\n"
        "outta_here: {\n"
        "  for (var x = 0; x < 10; ++x) {\n"
        "    for (var y = 0; y < 3; ++y) {\n"
        "      ++sum;\n"
        "      if (x + y == 12) { break outta_here; }\n"
        "    }\n"
        "  }\n"
        "}\n"
        "return sum;",
        {factory->NewNumber(30)}},
   };
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     ScopedVector<char> script(1024);
     SNPrintF(script, "function %s() { %s }\n%s();", kFunctionName,
              snippets[i].code_snippet, kFunctionName);
 
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     auto callable = tester.GetCallable<>();
     Handle<Object> return_value = callable().ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 
 TEST(BytecodeGraphBuilderWhile) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
 
   ExpectedSnippet<0> snippets[] = {
       {"var x = 1; while (x < 1) { x *= 100; } return x;",
        {factory->NewNumberFromInt(1)}},
       {"var x = 1, y = 0; while (x < 7) { y += x * x; x += 1; } return y;",
        {factory->NewNumberFromInt(91)}},
       {"var x = 1; while (true) { x += 1; if (x == 10) break; } return x;",
        {factory->NewNumberFromInt(10)}},
       {"var x = 1; while (false) { x += 1; } return x;",
@@ skipping 17 matching lines @@
        "  if (x == 4) break;\n"
        "}\n"
        "return y;",
        {factory->NewNumberFromInt(16)}}};
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     ScopedVector<char> script(1024);
     SNPrintF(script, "function %s() { %s }\n%s();", kFunctionName,
              snippets[i].code_snippet, kFunctionName);
 
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     auto callable = tester.GetCallable<>();
     Handle<Object> return_value = callable().ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 
 TEST(BytecodeGraphBuilderDo) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
 
   ExpectedSnippet<0> snippets[] = {
       {"var x = 1; do { x *= 100; } while (x < 100); return x;",
        {factory->NewNumberFromInt(100)}},
       {"var x = 1; do { x = x * x + 1; } while (x < 7) return x;",
        {factory->NewNumberFromInt(26)}},
       {"var x = 1; do { x += 1; } while (false); return x;",
        {factory->NewNumberFromInt(2)}},
       {"var x = 1, y = 0;\n"
@@ skipping 17 matching lines @@
        "  } while (x < 1)\n"
        "} while (sum < 3)\n"
        "return sum;",
        {factory->NewNumber(3)}}};
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     ScopedVector<char> script(1024);
     SNPrintF(script, "function %s() { %s }\n%s();", kFunctionName,
              snippets[i].code_snippet, kFunctionName);
 
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     auto callable = tester.GetCallable<>();
     Handle<Object> return_value = callable().ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 
 TEST(BytecodeGraphBuilderFor) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
 
   ExpectedSnippet<0> snippets[] = {
       {"for (var x = 0;; x = 2 * x + 1) { if (x > 10) return x; }",
        {factory->NewNumberFromInt(15)}},
       {"for (var x = 0; true; x = 2 * x + 1) { if (x > 100) return x; }",
        {factory->NewNumberFromInt(127)}},
       {"for (var x = 0; false; x = 2 * x + 1) { if (x > 100) return x; } "
        "return 0;",
        {factory->NewNumberFromInt(0)}},
@@ skipping 62 matching lines @@
        "}\n"
        "return sum;",
        {factory->NewNumberFromInt(50)}},
   };
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     ScopedVector<char> script(1024);
     SNPrintF(script, "function %s() { %s }\n%s();", kFunctionName,
              snippets[i].code_snippet, kFunctionName);
 
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     auto callable = tester.GetCallable<>();
     Handle<Object> return_value = callable().ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 
 TEST(BytecodeGraphBuilderForIn) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
   ExpectedSnippet<0> snippets[] = {
       {"var sum = 0;\n"
        "var empty = null;\n"
        "for (var x in empty) { sum++; }\n"
        "return sum;",
        {factory->NewNumberFromInt(0)}},
       {"var sum = 100;\n"
        "var empty = 1;\n"
        "for (var x in empty) { sum++; }\n"
@@ skipping 40 matching lines @@
        "}\n"
        "return sum;",
        {factory->NewNumberFromInt(6)}},
   };
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     ScopedVector<char> script(1024);
     SNPrintF(script, "function %s() { %s }\n%s();", kFunctionName,
              snippets[i].code_snippet, kFunctionName);
 
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     auto callable = tester.GetCallable<>();
     Handle<Object> return_value = callable().ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 
 TEST(BytecodeGraphBuilderForOf) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
   ExpectedSnippet<0> snippets[] = {
       {"  var r = 0;\n"
        "  for (var a of [0,6,7,9]) { r += a; }\n"
        "  return r;\n",
        {handle(Smi::FromInt(22), isolate)}},
       {"  var r = '';\n"
        "  for (var a of 'foobar') { r = a + r; }\n"
        "  return r;\n",
        {factory->NewStringFromStaticChars("raboof")}},
@@ skipping 61 matching lines @@
        "  for (a of obj) { r += a }\n"
        "  return r;\n",
        {factory->NewStringFromStaticChars("dcba")}},
   };
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     ScopedVector<char> script(1024);
     SNPrintF(script, "function %s() { %s }\n%s();", kFunctionName,
              snippets[i].code_snippet, kFunctionName);
 
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     auto callable = tester.GetCallable<>();
     Handle<Object> return_value = callable().ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 void TestJumpWithConstantsAndWideConstants(size_t shard) {
   const int kStep = 46;
   int start = static_cast<int>(7 + 17 * shard);
   for (int constants = start; constants < 300; constants += kStep) {
@@ skipping 15 matching lines @@
     script_os << "    else { " << filler << " }\n";
     script_os << "  }\n";
     script_os << "  return i;\n";
     script_os << "}\n";
     script_os << kFunctionName << "(0);\n";
     std::string script(script_os.str());
 
     HandleAndZoneScope scope;
     auto isolate = scope.main_isolate();
     auto factory = isolate->factory();
-    auto zone = scope.main_zone();
-    BytecodeGraphTester tester(isolate, zone, script.c_str());
+    BytecodeGraphTester tester(isolate, script.c_str());
     auto callable = tester.GetCallable<Handle<Object>>();
     for (int a = 0; a < 3; a++) {
       Handle<Object> return_val =
           callable(factory->NewNumberFromInt(a)).ToHandleChecked();
       static const int results[] = {11, 12, 2};
       CHECK_EQ(Handle<Smi>::cast(return_val)->value(), results[a]);
     }
   }
 }
 
 SHARD_TEST_BY_4(JumpWithConstantsAndWideConstants)
 
 TEST(BytecodeGraphBuilderDoExpressions) {
   bool old_flag = FLAG_harmony_do_expressions;
   FLAG_harmony_do_expressions = true;
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
   ExpectedSnippet<0> snippets[] = {
       {"var a = do {}; return a;", {factory->undefined_value()}},
       {"var a = do { var x = 100; }; return a;", {factory->undefined_value()}},
       {"var a = do { var x = 100; }; return a;", {factory->undefined_value()}},
       {"var a = do { var x = 100; x++; }; return a;",
        {handle(Smi::FromInt(100), isolate)}},
       {"var i = 0; for (; i < 5;) { i = do { if (i == 3) { break; }; i + 1; }};"
        "return i;",
        {handle(Smi::FromInt(3), isolate)}},
   };
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     ScopedVector<char> script(1024);
     SNPrintF(script, "function %s() { %s }\n%s();", kFunctionName,
              snippets[i].code_snippet, kFunctionName);
 
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     auto callable = tester.GetCallable<>();
     Handle<Object> return_value = callable().ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 
   FLAG_harmony_do_expressions = old_flag;
 }
 
 TEST(BytecodeGraphBuilderWithStatement) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
 
   ExpectedSnippet<0> snippets[] = {
       {"with({x:42}) return x;", {handle(Smi::FromInt(42), isolate)}},
       {"with({}) { var y = 10; return y;}",
        {handle(Smi::FromInt(10), isolate)}},
       {"var y = {x:42};"
        " function inner() {"
        "   var x = 20;"
        "   with(y) return x;"
        "}"
        "return inner();",
        {handle(Smi::FromInt(42), isolate)}},
       {"var y = {x:42};"
        " function inner(o) {"
        "   var x = 20;"
        "   with(o) return x;"
        "}"
        "return inner(y);",
        {handle(Smi::FromInt(42), isolate)}},
   };
 
   for (size_t i = 0; i < arraysize(snippets); i++) {
     ScopedVector<char> script(1024);
     SNPrintF(script, "function %s() { %s }\n%s();", kFunctionName,
              snippets[i].code_snippet, kFunctionName);
 
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     auto callable = tester.GetCallable<>();
     Handle<Object> return_value = callable().ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 TEST(BytecodeGraphBuilderConstDeclaration) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
 
   ExpectedSnippet<0> snippets[] = {
       {"const x = 3; return x;", {handle(Smi::FromInt(3), isolate)}},
       {"let x = 10; x = x + 20; return x;",
        {handle(Smi::FromInt(30), isolate)}},
       {"let x = 10; x = 20; return x;", {handle(Smi::FromInt(20), isolate)}},
       {"let x; x = 20; return x;", {handle(Smi::FromInt(20), isolate)}},
       {"let x; return x;", {factory->undefined_value()}},
       {"var x = 10; { let x = 30; } return x;",
@@ skipping 16 matching lines @@
        "return a;\n",
        {handle(Smi::FromInt(55), isolate)}},
   };
 
   // Tests for sloppy mode.
   for (size_t i = 0; i < arraysize(snippets); i++) {
     ScopedVector<char> script(1024);
     SNPrintF(script, "function %s() { %s }\n%s();", kFunctionName,
              snippets[i].code_snippet, kFunctionName);
 
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     auto callable = tester.GetCallable<>();
     Handle<Object> return_value = callable().ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 
   // Tests for strict mode.
   for (size_t i = 0; i < arraysize(snippets); i++) {
     ScopedVector<char> script(1024);
     SNPrintF(script, "function %s() {'use strict'; %s }\n%s();", kFunctionName,
              snippets[i].code_snippet, kFunctionName);
 
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     auto callable = tester.GetCallable<>();
     Handle<Object> return_value = callable().ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 TEST(BytecodeGraphBuilderConstDeclarationLookupSlots) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
   Factory* factory = isolate->factory();
 
   ExpectedSnippet<0> snippets[] = {
       {"const x = 3; function f1() {return x;}; return x;",
        {handle(Smi::FromInt(3), isolate)}},
       {"let x = 10; x = x + 20; function f1() {return x;}; return x;",
        {handle(Smi::FromInt(30), isolate)}},
       {"let x; x = 20; function f1() {return x;}; return x;",
        {handle(Smi::FromInt(20), isolate)}},
       {"let x; function f1() {return x;}; return x;",
        {factory->undefined_value()}},
   };
 
   // Tests for sloppy mode.
   for (size_t i = 0; i < arraysize(snippets); i++) {
     ScopedVector<char> script(1024);
     SNPrintF(script, "function %s() { %s }\n%s();", kFunctionName,
              snippets[i].code_snippet, kFunctionName);
 
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     auto callable = tester.GetCallable<>();
     Handle<Object> return_value = callable().ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 
   // Tests for strict mode.
   for (size_t i = 0; i < arraysize(snippets); i++) {
     ScopedVector<char> script(1024);
     SNPrintF(script, "function %s() {'use strict'; %s }\n%s();", kFunctionName,
              snippets[i].code_snippet, kFunctionName);
 
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     auto callable = tester.GetCallable<>();
     Handle<Object> return_value = callable().ToHandleChecked();
     CHECK(return_value->SameValue(*snippets[i].return_value()));
   }
 }
 
 TEST(BytecodeGraphBuilderConstInLookupContextChain) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
 
   const char* prologue =
       "function OuterMost() {\n"
       "  const outerConst = 10;\n"
       "  let outerLet = 20;\n"
       "  function Outer() {\n"
       "    function Inner() {\n"
       "      this.innerFunc = function() { ";
   const char* epilogue =
       "      }\n"
@@ skipping 17 matching lines @@
       {"var outerConst = 50; return outerConst;",
        {handle(Smi::FromInt(50), isolate)}},
       {"try { outerConst = 30 } catch(e) { return -1; }",
        {handle(Smi::FromInt(-1), isolate)}}};
 
   for (size_t i = 0; i < arraysize(const_decl); i++) {
     ScopedVector<char> script(1024);
     SNPrintF(script, "%s %s %s", prologue, const_decl[i].code_snippet,
              epilogue);
 
-    BytecodeGraphTester tester(isolate, zone, script.start(), "*");
+    BytecodeGraphTester tester(isolate, script.start(), "*");
     auto callable = tester.GetCallable<>();
     Handle<Object> return_value = callable().ToHandleChecked();
     CHECK(return_value->SameValue(*const_decl[i].return_value()));
   }
 }
 
 TEST(BytecodeGraphBuilderIllegalConstDeclaration) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
 
   ExpectedSnippet<0, const char*> illegal_const_decl[] = {
       {"const x = x = 10 + 3; return x;",
        {"Uncaught ReferenceError: x is not defined"}},
       {"const x = 10; x = 20; return x;",
        {"Uncaught TypeError: Assignment to constant variable."}},
       {"const x = 10; { x = 20; } return x;",
        {"Uncaught TypeError: Assignment to constant variable."}},
       {"const x = 10; eval('x = 20;'); return x;",
        {"Uncaught TypeError: Assignment to constant variable."}},
       {"let x = x + 10; return x;",
        {"Uncaught ReferenceError: x is not defined"}},
       {"'use strict'; (function f1() { f1 = 123; })() ",
        {"Uncaught TypeError: Assignment to constant variable."}},
   };
 
   // Tests for sloppy mode.
   for (size_t i = 0; i < arraysize(illegal_const_decl); i++) {
     ScopedVector<char> script(1024);
     SNPrintF(script, "function %s() { %s }\n%s();", kFunctionName,
              illegal_const_decl[i].code_snippet, kFunctionName);
 
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     v8::Local<v8::String> message = tester.CheckThrowsReturnMessage()->Get();
     v8::Local<v8::String> expected_string =
         v8_str(illegal_const_decl[i].return_value());
     CHECK(
         message->Equals(CcTest::isolate()->GetCurrentContext(), expected_string)
             .FromJust());
   }
 
   // Tests for strict mode.
   for (size_t i = 0; i < arraysize(illegal_const_decl); i++) {
     ScopedVector<char> script(1024);
     SNPrintF(script, "function %s() {'use strict'; %s }\n%s();", kFunctionName,
              illegal_const_decl[i].code_snippet, kFunctionName);
 
-    BytecodeGraphTester tester(isolate, zone, script.start());
+    BytecodeGraphTester tester(isolate, script.start());
     v8::Local<v8::String> message = tester.CheckThrowsReturnMessage()->Get();
     v8::Local<v8::String> expected_string =
         v8_str(illegal_const_decl[i].return_value());
     CHECK(
         message->Equals(CcTest::isolate()->GetCurrentContext(), expected_string)
             .FromJust());
   }
 }
 
 static int debug_break_count = 0;
 static void DebugEventCounter(const v8::Debug::EventDetails& event_details) {
   if (event_details.GetEvent() == v8::Break) debug_break_count++;
 }
 
 TEST(BytecodeGraphBuilderDebuggerStatement) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
-  Zone* zone = scope.main_zone();
 
   v8::Debug::SetDebugEventListener(CcTest::isolate(), DebugEventCounter);
 
   ExpectedSnippet<0> snippet = {
       "function f() {"
       "  debugger;"
       "}"
       "f();",
       {isolate->factory()->undefined_value()}};
 
-  BytecodeGraphTester tester(isolate, zone, snippet.code_snippet);
+  BytecodeGraphTester tester(isolate, snippet.code_snippet);
   auto callable = tester.GetCallable<>();
   Handle<Object> return_value = callable().ToHandleChecked();
 
   v8::Debug::SetDebugEventListener(CcTest::isolate(), nullptr);
   CHECK(return_value.is_identical_to(snippet.return_value()));
   CHECK_EQ(2, debug_break_count);
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8