commit 691124fa1bbd0636225afda657712b649ab4d2ba
author David Srbecky <dsrbecky@google.com> Sat Jun 23 22:05:53 2018 +0100
committer David Srbecky <dsrbecky@google.com> Wed Jul 04 15:14:19 2018 +0000
tree 7b13a14f0ce6d6ca11de3957664c2a44c359e8a2
parent 64cdf56aeac47ab2dfd4f6437f976de9a9ad372d

Use frame info from CodeInfo.

Still keep the other copy around for verification.

Test: test-art-host-gtest
Change-Id: Iae4672e52d7ff3006d8f2b6238aecfac6101a1d8

runtime/oat_quick_method_header.h

diff --git a/runtime/oat_quick_method_header.h b/runtime/oat_quick_method_header.h
index 3d5be36..1e4ca3e 100644
--- a/runtime/oat_quick_method_header.h
+++ b/runtime/oat_quick_method_header.h
@@ -22,6 +22,7 @@
 #include "base/utils.h"
 #include "method_info.h"
 #include "quick/quick_method_frame_info.h"
+#include "stack_map.h"
 
 namespace art {
 
@@ -62,9 +63,9 @@
     return GetCodeSize() != 0 && vmap_table_offset_ != 0;
   }
 
-  const void* GetOptimizedCodeInfoPtr() const {
+  const uint8_t* GetOptimizedCodeInfoPtr() const {
     DCHECK(IsOptimized());
-    return reinterpret_cast<const void*>(code_ - vmap_table_offset_);
+    return code_ - vmap_table_offset_;
   }
 
   uint8_t* GetOptimizedCodeInfoPtr() {
@@ -158,7 +159,12 @@
   }
 
   QuickMethodFrameInfo GetFrameInfo() const {
-    return frame_info_;
+    DCHECK(IsOptimized());
+    QuickMethodFrameInfo frame_info = CodeInfo::DecodeFrameInfo(GetOptimizedCodeInfoPtr());
+    DCHECK_EQ(frame_info.FrameSizeInBytes(), frame_info_.FrameSizeInBytes());
+    DCHECK_EQ(frame_info.CoreSpillMask(), frame_info_.CoreSpillMask());
+    DCHECK_EQ(frame_info.FpSpillMask(), frame_info_.FpSpillMask());
+    return frame_info;
   }
 
   uintptr_t ToNativeQuickPc(ArtMethod* method,