diff options
| author | Andreas Gampe <agampe@google.com> | 2015-03-30 14:39:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-30 14:39:34 +0000 |
| commit | 618cc856c0af05ea3b162bd8490999e54a2abc1b (patch) | |
| tree | f27af95ec6aa737ef4ecce33df6ecc8279c47ad1 /compiler | |
| parent | 547bfb87696fb53a87d4f4418da86938179af9cd (diff) | |
| parent | bb9c6b1c55e9e2308b4f5892a398a8837231fdbd (diff) | |
| download | android_art-618cc856c0af05ea3b162bd8490999e54a2abc1b.tar.gz android_art-618cc856c0af05ea3b162bd8490999e54a2abc1b.tar.bz2 android_art-618cc856c0af05ea3b162bd8490999e54a2abc1b.zip | |
Merge "ART: Refactor callbacks_ in common_runtime_test"
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/common_compiler_test.cc | 1 | ||||
| -rw-r--r-- | compiler/common_compiler_test.h | 1 | ||||
| -rw-r--r-- | compiler/oat_test.cc | 3 |
3 files changed, 0 insertions, 5 deletions
diff --git a/compiler/common_compiler_test.cc b/compiler/common_compiler_test.cc index 257406a622..1d0aad5425 100644 --- a/compiler/common_compiler_test.cc +++ b/compiler/common_compiler_test.cc @@ -180,7 +180,6 @@ void CommonCompilerTest::SetUpRuntimeOptions(RuntimeOptions* options) { callbacks_.reset(new QuickCompilerCallbacks(verification_results_.get(), method_inliner_map_.get(), CompilerCallbacks::CallbackMode::kCompileApp)); - options->push_back(std::make_pair("compilercallbacks", callbacks_.get())); } void CommonCompilerTest::TearDown() { diff --git a/compiler/common_compiler_test.h b/compiler/common_compiler_test.h index 9cffbc86f3..d7b210d571 100644 --- a/compiler/common_compiler_test.h +++ b/compiler/common_compiler_test.h @@ -78,7 +78,6 @@ class CommonCompilerTest : public CommonRuntimeTest { std::unique_ptr<CompilerOptions> compiler_options_; std::unique_ptr<VerificationResults> verification_results_; std::unique_ptr<DexFileToMethodInlinerMap> method_inliner_map_; - std::unique_ptr<CompilerCallbacks> callbacks_; std::unique_ptr<CompilerDriver> compiler_driver_; std::unique_ptr<CumulativeLogger> timer_; std::unique_ptr<const InstructionSetFeatures> instruction_set_features_; diff --git a/compiler/oat_test.cc b/compiler/oat_test.cc index d59ad6c32f..afd39e8874 100644 --- a/compiler/oat_test.cc +++ b/compiler/oat_test.cc @@ -85,9 +85,6 @@ TEST_F(OatTest, WriteRead) { compiler_options_.reset(new CompilerOptions); verification_results_.reset(new VerificationResults(compiler_options_.get())); method_inliner_map_.reset(new DexFileToMethodInlinerMap); - callbacks_.reset(new QuickCompilerCallbacks(verification_results_.get(), - method_inliner_map_.get(), - CompilerCallbacks::CallbackMode::kCompileApp)); timer_.reset(new CumulativeLogger("Compilation times")); compiler_driver_.reset(new CompilerDriver(compiler_options_.get(), verification_results_.get(), |