From 08f1f50d6c2e8f247b8f5f19711d75a792851c7a Mon Sep 17 00:00:00 2001 From: Ian Rogers Date: Tue, 2 Dec 2014 15:04:37 -0800 Subject: Remove FieldHelper. Change-Id: I2d74e2d5b3c35a691c95339de0db9361847fca11 --- compiler/driver/compiler_driver-inl.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'compiler/driver/compiler_driver-inl.h') diff --git a/compiler/driver/compiler_driver-inl.h b/compiler/driver/compiler_driver-inl.h index ebf7874dcf..3a91b08d5e 100644 --- a/compiler/driver/compiler_driver-inl.h +++ b/compiler/driver/compiler_driver-inl.h @@ -21,7 +21,6 @@ #include "dex/compiler_ir.h" #include "dex_compilation_unit.h" -#include "field_helper.h" #include "mirror/art_field-inl.h" #include "mirror/art_method-inl.h" #include "mirror/class_loader.h" @@ -134,10 +133,9 @@ inline std::pair CompilerDriver::IsFastStaticField( } else { // Search dex file for localized ssb index, may fail if field's class is a parent // of the class mentioned in the dex file and there is no dex cache entry. - StackHandleScope<1> hs(Thread::Current()); + std::string temp; const DexFile::StringId* string_id = - dex_file->FindStringId( - FieldHelper(hs.NewHandle(resolved_field)).GetDeclaringClassDescriptor()); + dex_file->FindStringId(resolved_field->GetDeclaringClass()->GetDescriptor(&temp)); if (string_id != nullptr) { const DexFile::TypeId* type_id = dex_file->FindTypeId(dex_file->GetIndexForStringId(*string_id)); -- cgit v1.2.3-59-g8ed1b