diff options
| author | 2015-12-10 08:27:00 +0000 | |
|---|---|---|
| committer | 2015-12-10 08:27:00 +0000 | |
| commit | 70a33905e90c655cb17303b238bace2a2f4d5bf9 (patch) | |
| tree | 8753a7d46e3e196ffa70f2263938bd51e816e5af /compiler/common_compiler_test.cc | |
| parent | 1d97f949e807e963dd92dcf9ac38def5301d555a (diff) | |
| parent | 83d4d72aa0e4170209ab50c67ba22e46b71352c1 (diff) | |
Merge "Revert "Add support for LZ4 compressed image files""
Diffstat (limited to 'compiler/common_compiler_test.cc')
| -rw-r--r-- | compiler/common_compiler_test.cc | 32 |
1 files changed, 10 insertions, 22 deletions
diff --git a/compiler/common_compiler_test.cc b/compiler/common_compiler_test.cc index 3901e25949..e6cc50cc5e 100644 --- a/compiler/common_compiler_test.cc +++ b/compiler/common_compiler_test.cc @@ -189,33 +189,21 @@ void CommonCompilerTest::SetUp() { } timer_.reset(new CumulativeLogger("Compilation times")); - CreateCompilerDriver(compiler_kind_, instruction_set); + compiler_driver_.reset(new CompilerDriver(compiler_options_.get(), + verification_results_.get(), + method_inliner_map_.get(), + compiler_kind_, instruction_set, + instruction_set_features_.get(), + true, + GetImageClasses(), + GetCompiledClasses(), + GetCompiledMethods(), + 2, true, true, "", false, timer_.get(), -1, "")); } // We typically don't generate an image in unit tests, disable this optimization by default. compiler_driver_->SetSupportBootImageFixup(false); } -void CommonCompilerTest::CreateCompilerDriver(Compiler::Kind kind, InstructionSet isa) { - compiler_driver_.reset(new CompilerDriver(compiler_options_.get(), - verification_results_.get(), - method_inliner_map_.get(), - kind, - isa, - instruction_set_features_.get(), - true, - GetImageClasses(), - GetCompiledClasses(), - GetCompiledMethods(), - 2, - true, - true, - "", - false, - timer_.get(), - -1, - "")); -} - void CommonCompilerTest::SetUpRuntimeOptions(RuntimeOptions* options) { CommonRuntimeTest::SetUpRuntimeOptions(options); |