diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-02-25 04:42:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-02-25 04:42:54 +0000 |
| commit | fffb0b7e23796e5470f4fab4611f2fcc4a16979c (patch) | |
| tree | 3c2fd045f635a0511149272af9ff55a01a31b83c /compiler/oat_test.cc | |
| parent | a0c9b085d4ecf90ca3aa1252e81e65072b377ca4 (diff) | |
| parent | 6449c62e40ef3a9bb75f664f922555affb532ee4 (diff) | |
| download | art-fffb0b7e23796e5470f4fab4611f2fcc4a16979c.zip art-fffb0b7e23796e5470f4fab4611f2fcc4a16979c.tar.gz art-fffb0b7e23796e5470f4fab4611f2fcc4a16979c.tar.bz2 | |
Merge "Create CompilerOptions"
Diffstat (limited to 'compiler/oat_test.cc')
| -rw-r--r-- | compiler/oat_test.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/compiler/oat_test.cc b/compiler/oat_test.cc index e9c77d1..e91ffcb 100644 --- a/compiler/oat_test.cc +++ b/compiler/oat_test.cc @@ -91,11 +91,14 @@ TEST_F(OatTest, WriteRead) { InstructionSet insn_set = kIsTargetBuild ? kThumb2 : kX86; InstructionSetFeatures insn_features; - verification_results_.reset(new VerificationResults); + compiler_options_.reset(new CompilerOptions); + verification_results_.reset(new VerificationResults(compiler_options_.get())); method_inliner_map_.reset(new DexFileToMethodInlinerMap); - callbacks_.Reset(verification_results_.get(), method_inliner_map_.get()); + callbacks_.reset(new CompilerCallbacksImpl(verification_results_.get(), + method_inliner_map_.get())); timer_.reset(new CumulativeLogger("Compilation times")); - compiler_driver_.reset(new CompilerDriver(verification_results_.get(), + compiler_driver_.reset(new CompilerDriver(compiler_options_.get(), + verification_results_.get(), method_inliner_map_.get(), compiler_backend, insn_set, insn_features, false, NULL, 2, true, true, |