Merge "Use image pointer size for profile info"

1 files changed, 2 insertions, 1 deletions

diff --git a/runtime/art_method.cc b/runtime/art_method.cc
index 6044a2a334..92648b9b1b 100644
--- a/runtime/art_method.cc
+++ b/runtime/art_method.cc
@@ -601,12 +601,13 @@ const uint8_t* ArtMethod::GetQuickenedInfo() {
 }
 
 ProfilingInfo* ArtMethod::CreateProfilingInfo() {
+  DCHECK(!Runtime::Current()->IsAotCompiler());
   ProfilingInfo* info = ProfilingInfo::Create(this);
   MemberOffset offset = ArtMethod::EntryPointFromJniOffset(sizeof(void*));
   uintptr_t pointer = reinterpret_cast<uintptr_t>(this) + offset.Uint32Value();
   if (!reinterpret_cast<Atomic<ProfilingInfo*>*>(pointer)->
           CompareExchangeStrongSequentiallyConsistent(nullptr, info)) {
-    return GetProfilingInfo();
+    return GetProfilingInfo(sizeof(void*));
   } else {
     return info;
   }