diff options
| author | 2016-10-05 00:39:07 +0000 | |
|---|---|---|
| committer | 2016-10-05 00:39:08 +0000 | |
| commit | 556c9a2f182c4fcb9eba9dc4937095665f314a2b (patch) | |
| tree | ffe6d3711b565330fb883953144ddd7603356804 /compiler/driver/compiler_driver-inl.h | |
| parent | e793bbb4a8a832423e7d6150b6a8fad75d63d36e (diff) | |
| parent | 1cc62e4ea24828fdb3f3da0b8603f0b107d09a04 (diff) | |
Merge "Rename ObjPtr::Decode to ObjPtr::Ptr"
Diffstat (limited to 'compiler/driver/compiler_driver-inl.h')
| -rw-r--r-- | compiler/driver/compiler_driver-inl.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/driver/compiler_driver-inl.h b/compiler/driver/compiler_driver-inl.h index b4730cc059..3e9e3cbce6 100644 --- a/compiler/driver/compiler_driver-inl.h +++ b/compiler/driver/compiler_driver-inl.h @@ -37,7 +37,7 @@ inline mirror::DexCache* CompilerDriver::GetDexCache(const DexCompilationUnit* m inline mirror::ClassLoader* CompilerDriver::GetClassLoader(const ScopedObjectAccess& soa, const DexCompilationUnit* mUnit) { - return soa.Decode<mirror::ClassLoader>(mUnit->GetClassLoader()).Decode(); + return soa.Decode<mirror::ClassLoader>(mUnit->GetClassLoader()).Ptr(); } inline mirror::Class* CompilerDriver::ResolveClass( @@ -123,7 +123,7 @@ inline std::pair<bool, bool> CompilerDriver::IsFastInstanceField( DCHECK(!resolved_field->IsStatic()); ObjPtr<mirror::Class> fields_class = resolved_field->GetDeclaringClass(); bool fast_get = referrer_class != nullptr && - referrer_class->CanAccessResolvedField(fields_class.Decode(), + referrer_class->CanAccessResolvedField(fields_class.Ptr(), resolved_field, dex_cache, field_idx); @@ -175,7 +175,7 @@ inline std::pair<bool, bool> CompilerDriver::IsClassOfStaticMemberAvailableToRef return std::make_pair(true, true); } if (CanAccessResolvedMember<ArtMember>( - referrer_class, members_class.Decode(), resolved_member, dex_cache, member_idx)) { + referrer_class, members_class.Ptr(), resolved_member, dex_cache, member_idx)) { // We have the resolved member, we must make it into a index for the referrer // in its static storage (which may fail if it doesn't have a slot for it) // TODO: for images we can elide the static storage base null check |