commit cba94faf17f9446f57e1ad2848703944970e51da
author Yohei Yukawa <yukawa@google.com> Thu Jul 05 01:35:44 2018 +0000
committer Yohei Yukawa <yukawa@google.com> Thu Jul 05 01:35:44 2018 +0000
tree a833bf651517419264cfa17a4c1bc61cf86c1800
parent 691124fa1bbd0636225afda657712b649ab4d2ba

Revert "Use frame info from CodeInfo."

This reverts commit 691124fa1bbd0636225afda657712b649ab4d2ba.

Reason for revert:
Multiple build failures due to check failure
  oat_quick_method_header.h:162 Check failed: IsOptimized()

Change-Id: I45f6f765a2067cbb13f28a2d0b783b020ac3432d

runtime/oat_quick_method_header.h

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