diff options
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/driver/compiler_driver-inl.h | 6 | ||||
| -rw-r--r-- | compiler/image_writer.cc | 4 | ||||
| -rw-r--r-- | compiler/jni/jni_compiler_test.cc | 2 | ||||
| -rw-r--r-- | compiler/oat_test.cc | 2 | ||||
| -rw-r--r-- | compiler/optimizing/reference_type_propagation.cc | 2 |
5 files changed, 8 insertions, 8 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 diff --git a/compiler/image_writer.cc b/compiler/image_writer.cc index 210943c88b..66938b2e07 100644 --- a/compiler/image_writer.cc +++ b/compiler/image_writer.cc @@ -908,7 +908,7 @@ void ImageWriter::PruneNonImageClasses() { ArtField** resolved_fields = dex_cache->GetResolvedFields(); for (size_t i = 0; i < dex_cache->NumResolvedFields(); i++) { ArtField* field = mirror::DexCache::GetElementPtrSize(resolved_fields, i, target_ptr_size_); - if (field != nullptr && !KeepClass(field->GetDeclaringClass().Decode())) { + if (field != nullptr && !KeepClass(field->GetDeclaringClass().Ptr())) { dex_cache->SetResolvedField(i, nullptr, target_ptr_size_); } } @@ -1742,7 +1742,7 @@ void ImageWriter::CopyAndFixupNativeData(size_t oat_index) { case kNativeObjectRelocationTypeArtField: { memcpy(dest, pair.first, sizeof(ArtField)); reinterpret_cast<ArtField*>(dest)->SetDeclaringClass( - GetImageAddress(reinterpret_cast<ArtField*>(pair.first)->GetDeclaringClass().Decode())); + GetImageAddress(reinterpret_cast<ArtField*>(pair.first)->GetDeclaringClass().Ptr())); break; } case kNativeObjectRelocationTypeRuntimeMethod: diff --git a/compiler/jni/jni_compiler_test.cc b/compiler/jni/jni_compiler_test.cc index 19d55a3845..dca290c561 100644 --- a/compiler/jni/jni_compiler_test.cc +++ b/compiler/jni/jni_compiler_test.cc @@ -1283,7 +1283,7 @@ jarray Java_MyClassNatives_GetSinkProperties(JNIEnv*, jobject thisObj, jstring s Thread* self = Thread::Current(); ScopedObjectAccess soa(self); - EXPECT_TRUE(self->HoldsLock(soa.Decode<mirror::Object>(thisObj).Decode())); + EXPECT_TRUE(self->HoldsLock(soa.Decode<mirror::Object>(thisObj).Ptr())); return nullptr; } diff --git a/compiler/oat_test.cc b/compiler/oat_test.cc index e8bc67d967..9f352ce093 100644 --- a/compiler/oat_test.cc +++ b/compiler/oat_test.cc @@ -498,7 +498,7 @@ TEST_F(OatTest, EmptyTextSection) { for (const DexFile* dex_file : dex_files) { ScopedObjectAccess soa(Thread::Current()); class_linker->RegisterDexFile(*dex_file, - soa.Decode<mirror::ClassLoader>(class_loader).Decode()); + soa.Decode<mirror::ClassLoader>(class_loader).Ptr()); } compiler_driver_->SetDexFilesForOatFile(dex_files); compiler_driver_->CompileAll(class_loader, dex_files, &timings); diff --git a/compiler/optimizing/reference_type_propagation.cc b/compiler/optimizing/reference_type_propagation.cc index 15cebfe71b..45a3ce411e 100644 --- a/compiler/optimizing/reference_type_propagation.cc +++ b/compiler/optimizing/reference_type_propagation.cc @@ -454,7 +454,7 @@ void ReferenceTypePropagation::RTPVisitor::SetClassAsTypeInfo(HInstruction* inst } instr->SetReferenceTypeInfo( ReferenceTypeInfo::Create(handle_cache_->GetStringClassHandle(), /* is_exact */ true)); - } else if (IsAdmissible(klass.Decode())) { + } else if (IsAdmissible(klass.Ptr())) { ReferenceTypeInfo::TypeHandle handle = handle_cache_->NewHandle(klass); is_exact = is_exact || handle->CannotBeAssignedFromOtherTypes(); instr->SetReferenceTypeInfo(ReferenceTypeInfo::Create(handle, is_exact)); |