diff options
author | Mathieu Chartier <mathieuc@google.com> | 2016-10-18 16:27:40 -0700 |
---|---|---|
committer | Mathieu Chartier <mathieuc@google.com> | 2016-10-19 10:04:37 -0700 |
commit | 28357fab628bd9b91749988b554977398caf9963 (patch) | |
tree | 957fac3c1003713c349e0e216762836138c596a7 /compiler/driver/compiler_driver_test.cc | |
parent | c89f9776a107ca20d0146c16fa881db91c4f8266 (diff) |
Move most of class linker to ObjPtr
Return values are still mirror pointer. Fix some failing asserts in
compiler driver and tests.
Bug: 31113334
Test: test-art-host
Change-Id: I4450bf9dfb2541749496b8388616e8aae8488919
Diffstat (limited to 'compiler/driver/compiler_driver_test.cc')
-rw-r--r-- | compiler/driver/compiler_driver_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/driver/compiler_driver_test.cc b/compiler/driver/compiler_driver_test.cc index 20f0e5ee31..845028d427 100644 --- a/compiler/driver/compiler_driver_test.cc +++ b/compiler/driver/compiler_driver_test.cc @@ -106,7 +106,7 @@ TEST_F(CompilerDriverTest, DISABLED_LARGE_CompileDexLibCore) { ScopedObjectAccess soa(Thread::Current()); ASSERT_TRUE(java_lang_dex_file_ != nullptr); const DexFile& dex = *java_lang_dex_file_; - mirror::DexCache* dex_cache = class_linker_->FindDexCache(soa.Self(), dex); + ObjPtr<mirror::DexCache> dex_cache = class_linker_->FindDexCache(soa.Self(), dex); EXPECT_EQ(dex.NumStringIds(), dex_cache->NumStrings()); for (size_t i = 0; i < dex_cache->NumStrings(); i++) { const mirror::String* string = dex_cache->GetResolvedString(i); |