commit bf5f0f3f1eea2e712e7269ff1e1f9b1bcc4cbaee
author Nicolas Geoffray <ngeoffray@google.com> Tue Mar 05 15:41:50 2019 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Wed Mar 06 14:21:51 2019 +0000
tree 030ef55b56ede3dbf42b6b5f19c59bfc0583636f
parent 7e057ec0e023910f6bc42bc552a8463343cf346f

Revert "Revert^2 "Add code size to CodeInfo""

This reverts commit e1412dacbf1d2a809bd1fca658cc8cb8f61f8ee6.

Bug: 123510633
Bug: 127305289

Reason for revert: b/127305289

Change-Id: I54557b05a44777f1fa2c15bde4fa648980f42eed

runtime/oat_quick_method_header.h

diff --git a/runtime/oat_quick_method_header.h b/runtime/oat_quick_method_header.h
index 6c123c4..8798c69 100644
--- a/runtime/oat_quick_method_header.h
+++ b/runtime/oat_quick_method_header.h
@@ -35,8 +35,6 @@
                        uint32_t code_size)
       : vmap_table_offset_(vmap_table_offset),
         code_size_(code_size) {
-    DCHECK_NE(vmap_table_offset, 0u);
-    DCHECK_NE(code_size, 0u);
   }
 
   static OatQuickMethodHeader* FromCodePointer(const void* code_ptr) {
@@ -60,7 +58,7 @@
   }
 
   bool IsOptimized() const {
-    return (code_size_ & kCodeSizeMask) != 0 && vmap_table_offset_ != 0;
+    return GetCodeSize() != 0 && vmap_table_offset_ != 0;
   }
 
   const uint8_t* GetOptimizedCodeInfoPtr() const {
@@ -78,11 +76,7 @@
   }
 
   uint32_t GetCodeSize() const {
-    DCHECK(IsOptimized());
-    size_t code_size1 = code_size_ & kCodeSizeMask;
-    size_t code_size2 = CodeInfo::DecodeCodeSize(GetOptimizedCodeInfoPtr());
-    DCHECK_EQ(code_size1, code_size2);
-    return code_size2;
+    return code_size_ & kCodeSizeMask;
   }
 
   const uint32_t* GetCodeSizeAddr() const {