| Index: test/cctest/compiler/test-codegen-deopt.cc
|
| diff --git a/test/cctest/compiler/test-codegen-deopt.cc b/test/cctest/compiler/test-codegen-deopt.cc
|
| index 26e3a831f2350ad71ddd3252c9537a41cf73c823..f01b0e13fa212400f9b48628a36028db62e7a887 100644
|
| --- a/test/cctest/compiler/test-codegen-deopt.cc
|
| +++ b/test/cctest/compiler/test-codegen-deopt.cc
|
| @@ -16,6 +16,7 @@
|
| #include "src/compiler/register-allocator.h"
|
| #include "src/compiler/schedule.h"
|
|
|
| +#include "src/ast-numbering.h"
|
| #include "src/full-codegen.h"
|
| #include "src/parser.h"
|
| #include "src/rewriter.h"
|
| @@ -46,8 +47,7 @@ class DeoptCodegenTester {
|
| bailout_id(-1) {
|
| CHECK(Parser::Parse(&info));
|
| info.SetOptimizing(BailoutId::None(), Handle<Code>(function->code()));
|
| - CHECK(Rewriter::Rewrite(&info));
|
| - CHECK(Scope::Analyze(&info));
|
| + CHECK(Compiler::Analyze(&info));
|
| CHECK(Compiler::EnsureDeoptimizationSupport(&info));
|
|
|
| DCHECK(info.shared_info()->has_deoptimization_support());
|
| @@ -64,11 +64,12 @@ class DeoptCodegenTester {
|
| }
|
|
|
| // Initialize the codegen and generate code.
|
| - Linkage* linkage = new (scope_->main_zone()) Linkage(&info);
|
| - code = new v8::internal::compiler::InstructionSequence(linkage, graph,
|
| - schedule);
|
| + Linkage* linkage = new (scope_->main_zone()) Linkage(info.zone(), &info);
|
| + code = new v8::internal::compiler::InstructionSequence(scope_->main_zone(),
|
| + graph, schedule);
|
| SourcePositionTable source_positions(graph);
|
| - InstructionSelector selector(code, &source_positions);
|
| + InstructionSelector selector(scope_->main_zone(), linkage, code, schedule,
|
| + &source_positions);
|
| selector.SelectInstructions();
|
|
|
| if (FLAG_trace_turbo) {
|
| @@ -76,7 +77,8 @@ class DeoptCodegenTester {
|
| << *code;
|
| }
|
|
|
| - RegisterAllocator allocator(code);
|
| + Frame frame;
|
| + RegisterAllocator allocator(scope_->main_zone(), &frame, &info, code);
|
| CHECK(allocator.Allocate());
|
|
|
| if (FLAG_trace_turbo) {
|
| @@ -84,7 +86,7 @@ class DeoptCodegenTester {
|
| << *code;
|
| }
|
|
|
| - compiler::CodeGenerator generator(code);
|
| + compiler::CodeGenerator generator(&frame, linkage, code, &info);
|
| result_code = generator.GenerateCode();
|
|
|
| #ifdef OBJECT_PRINT
|
|
|