diff options
| author | Vladimir Marko <vmarko@google.com> | 2014-09-25 18:08:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-25 18:08:04 +0000 |
| commit | 1ed5b27ee329208fd8ae22b8a9a61d708e2c1ffb (patch) | |
| tree | e80187277f4a41c9b41a25ebb6dd9567b66fd2bf /compiler/oat_test.cc | |
| parent | 34bb808affbed7a1db177b9ef4ab5461c2b2106b (diff) | |
| parent | f4da675bbc4615c5f854c81964cac9dd1153baea (diff) | |
| download | art-1ed5b27ee329208fd8ae22b8a9a61d708e2c1ffb.tar.gz art-1ed5b27ee329208fd8ae22b8a9a61d708e2c1ffb.tar.bz2 art-1ed5b27ee329208fd8ae22b8a9a61d708e2c1ffb.zip | |
Merge "Implement method calls using relative BL on ARM."
Diffstat (limited to 'compiler/oat_test.cc')
| -rw-r--r-- | compiler/oat_test.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/oat_test.cc b/compiler/oat_test.cc index 80d7b982b..0b1f9e2cf 100644 --- a/compiler/oat_test.cc +++ b/compiler/oat_test.cc @@ -114,7 +114,6 @@ TEST_F(OatTest, WriteRead) { compiler_driver_->CompileAll(class_loader, class_linker->GetBootClassPath(), &timings); } - ScopedObjectAccess soa(Thread::Current()); ScratchFile tmp; SafeMap<std::string, std::string> key_value_store; key_value_store.Put(OatHeader::kImageLocationKey, "lue.art"); @@ -123,6 +122,7 @@ TEST_F(OatTest, WriteRead) { 4096U, 0, compiler_driver_.get(), + nullptr, &timings, &key_value_store); bool success = compiler_driver_->WriteElf(GetTestAndroidRoot(), @@ -152,6 +152,7 @@ TEST_F(OatTest, WriteRead) { &dex_file_checksum); ASSERT_TRUE(oat_dex_file != nullptr); CHECK_EQ(dex_file->GetLocationChecksum(), oat_dex_file->GetDexFileLocationChecksum()); + ScopedObjectAccess soa(Thread::Current()); for (size_t i = 0; i < dex_file->NumClassDefs(); i++) { const DexFile::ClassDef& class_def = dex_file->GetClassDef(i); const byte* class_data = dex_file->GetClassData(class_def); |