From 8f20a23a35fa6fbe4dcb4ff70268a24dc7fb2a24 Mon Sep 17 00:00:00 2001 From: David Srbecky Date: Tue, 12 Feb 2019 19:42:54 +0000 Subject: Revert "Add code size to CodeInfo" This reverts commit 68efa7b1128486e08ae60cd27181645b27bbd2e4. Reason for revert: Breaks tests Change-Id: I28fb143990f58e0d5f0b106bea9d9a159f19297e --- runtime/stack_map.h | 9 --------- 1 file changed, 9 deletions(-) (limited to 'runtime/stack_map.h') diff --git a/runtime/stack_map.h b/runtime/stack_map.h index 59da923661..87133cf59c 100644 --- a/runtime/stack_map.h +++ b/runtime/stack_map.h @@ -438,15 +438,8 @@ class CodeInfo { // Accumulate code info size statistics into the given Stats tree. static void CollectSizeStats(const uint8_t* code_info, /*out*/ Stats* parent); - ALWAYS_INLINE static size_t DecodeCodeSize(const uint8_t* data, - InstructionSet isa = kRuntimeISA) { - uint32_t packed_code_size = BitMemoryReader(data).ReadVarint(); - return StackMap::UnpackNativePc(packed_code_size, isa); - } - ALWAYS_INLINE static QuickMethodFrameInfo DecodeFrameInfo(const uint8_t* data) { BitMemoryReader reader(data); - reader.ReadVarint(); // Skip code size. return QuickMethodFrameInfo( reader.ReadVarint() * kStackAlignment, // Decode packed_frame_size_ and unpack. reader.ReadVarint(), // core_spill_mask_. @@ -468,7 +461,6 @@ class CodeInfo { // Invokes the callback with member pointer of each header field. template ALWAYS_INLINE static void ForEachHeaderField(Callback callback) { - callback(&CodeInfo::packed_code_size_); callback(&CodeInfo::packed_frame_size_); callback(&CodeInfo::core_spill_mask_); callback(&CodeInfo::fp_spill_mask_); @@ -494,7 +486,6 @@ class CodeInfo { callback(&CodeInfo::dex_register_catalog_); } - uint32_t packed_code_size_ = 0; // The size of native PC range. uint32_t packed_frame_size_ = 0; // Frame size in kStackAlignment units. uint32_t core_spill_mask_ = 0; uint32_t fp_spill_mask_ = 0; -- cgit v1.2.3-59-g8ed1b