diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2016-10-03 18:01:28 -0700 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2016-10-04 10:46:16 -0700 |
| commit | 1cc62e4ea24828fdb3f3da0b8603f0b107d09a04 (patch) | |
| tree | 718e322f3d05ac095770d4dc2a68b824bf3974a7 /compiler/driver/compiler_driver-inl.h | |
| parent | 82d4838d6bb3480cd25327cedc5179fb2d86881c (diff) | |
Rename ObjPtr::Decode to ObjPtr::Ptr
Done to prevent ambiguity with ScopedObjectAccess::Decode.
Bug: 31113334
Test: test-art-host
Change-Id: I07a2497cc9cf66386311798933547471987fc316
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 9efd636d2f..d807fcad96 100644 --- a/compiler/driver/compiler_driver-inl.h +++ b/compiler/driver/compiler_driver-inl.h @@ -33,7 +33,7 @@ namespace art { 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( @@ -98,7 +98,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); @@ -150,7 +150,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 |