diff options
author | Elliott Hughes <enh@google.com> | 2014-12-11 14:34:28 -0800 |
---|---|---|
committer | Elliott Hughes <enh@google.com> | 2014-12-12 09:33:34 -0800 |
commit | 956af0f0cb05422e38c1d22cbef309d16b8a1a12 (patch) | |
tree | b558c804d206dad8da648b815750f1b3c97610ae /runtime/mirror/art_method-inl.h | |
parent | 407d77f344cfbdbbfb50531c5f0766bc0892e2fe (diff) | |
download | android_art-956af0f0cb05422e38c1d22cbef309d16b8a1a12.tar.gz android_art-956af0f0cb05422e38c1d22cbef309d16b8a1a12.tar.bz2 android_art-956af0f0cb05422e38c1d22cbef309d16b8a1a12.zip |
Remove portable.
Change-Id: I3bf3250fa866fd2265f1b115d52fa5dedc48a7fc
Diffstat (limited to 'runtime/mirror/art_method-inl.h')
-rw-r--r-- | runtime/mirror/art_method-inl.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/runtime/mirror/art_method-inl.h b/runtime/mirror/art_method-inl.h index c29276a238..91dd52542b 100644 --- a/runtime/mirror/art_method-inl.h +++ b/runtime/mirror/art_method-inl.h @@ -24,6 +24,7 @@ #include "class_linker.h" #include "dex_cache.h" #include "dex_file.h" +#include "dex_file-inl.h" #include "object-inl.h" #include "object_array.h" #include "oat.h" @@ -72,12 +73,7 @@ inline uint16_t ArtMethod::GetMethodIndexDuringLinking() { } inline uint32_t ArtMethod::GetDexMethodIndex() { -#ifdef ART_SEA_IR_MODE - // TODO: Re-add this check for (PORTABLE + SMALL + ) SEA IR when PORTABLE IS fixed! - // DCHECK(GetDeclaringClass()->IsLoaded() || GetDeclaringClass()->IsErroneous()); -#else DCHECK(GetDeclaringClass()->IsLoaded() || GetDeclaringClass()->IsErroneous()); -#endif return GetField32(OFFSET_OF_OBJECT_MEMBER(ArtMethod, dex_method_index_)); } @@ -187,21 +183,11 @@ inline uint32_t ArtMethod::GetQuickOatCodeOffset() { return PointerToLowMemUInt32(GetEntryPointFromQuickCompiledCode()); } -inline uint32_t ArtMethod::GetPortableOatCodeOffset() { - DCHECK(!Runtime::Current()->IsStarted()); - return PointerToLowMemUInt32(GetEntryPointFromPortableCompiledCode()); -} - inline void ArtMethod::SetQuickOatCodeOffset(uint32_t code_offset) { DCHECK(!Runtime::Current()->IsStarted()); SetEntryPointFromQuickCompiledCode(reinterpret_cast<void*>(code_offset)); } -inline void ArtMethod::SetPortableOatCodeOffset(uint32_t code_offset) { - DCHECK(!Runtime::Current()->IsStarted()); - SetEntryPointFromPortableCompiledCode(reinterpret_cast<void*>(code_offset)); -} - inline const uint8_t* ArtMethod::GetMappingTable(size_t pointer_size) { const void* code_pointer = GetQuickOatCodePointer(pointer_size); if (code_pointer == nullptr) { |